Merge pull request #64 from PatchworkMC/feature/iforgeblock

Skeleton implementation of IForgeBlock and IForgeBlockState

Author: coderbot16

patchwork-extensions-block/build.gradle

@@ -0,0 +1,2 @@
+archivesBaseName = "patchwork-extensions-block"
+version = getSubprojectVersion(project, "0.1.0")

patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java

@@ -0,0 +1,33 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.patchworkmc.mixin.extensions.block;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.tag.BlockTags;
+
+@Mixin(BlockTags.class)
+public interface BlockTagsAccessor {
+	@Accessor
+	static int getLatestVersion() {
+		throw new UnsupportedOperationException();
+	}
+}

patchwork-extensions-block/src/main/java/net/minecraftforge/common/extensions/IForgeBlockState.java

@@ -0,0 +1,34 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.patchworkmc.mixin.extensions.block;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FireBlock;
+
+@Mixin(FireBlock.class)
+public interface FireBlockAccessor {
+	@Invoker
+	int invokeGetBurnChance(BlockState state);
+	@Invoker
+	int invokeGetSpreadChance(BlockState state);
+}

patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/BlockTagsAccessor.java

@@ -0,0 +1,39 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.patchworkmc.mixin.extensions.block;
+
+import javax.annotation.Nullable;
+
+import org.spongepowered.asm.mixin.Mixin;
+import net.minecraftforge.common.extensions.IForgeBlock;
+
+import net.minecraft.block.BedBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
+
+@Mixin(BedBlock.class)
+public abstract class MixinBedBlock implements IForgeBlock {
+	@Override
+	public boolean isBed(BlockState state, BlockView world, BlockPos pos, @Nullable Entity player) {
+		return true;
+	}
+}

patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/FireBlockAccessor.java

@@ -0,0 +1,78 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.patchworkmc.mixin.extensions.block;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
+import net.minecraftforge.common.extensions.IForgeBlock;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.tag.BlockTags;
+import net.minecraft.tag.Tag;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.CollisionView;
+
+@Mixin(Block.class)
+public class MixinBlock implements IForgeBlock {
+	@Shadow
+	@Final
+	private float slipperiness;
+
+	@Unique
+	private Set<Identifier> cachedTags;
+	@Unique
+	private int tagVersion;
+
+	@Override
+	public float getSlipperiness(BlockState state, CollisionView world, BlockPos pos, Entity entity) {
+		return slipperiness;
+	}
+
+	@Override
+	public int getHarvestLevel(BlockState state) {
+		throw new UnsupportedOperationException("Harvest levels not yet implemented"); // TODO implement getHarvestLevel, really sucks for vanilla blocks so i'm putting it off
+	}
+
+	@Override
+	public Set<Identifier> getTags() {
+		if (cachedTags == null || tagVersion != BlockTagsAccessor.getLatestVersion()) {
+			this.cachedTags = new HashSet<>();
+
+			for (final Map.Entry<Identifier, Tag<Block>> entry : BlockTags.getContainer().getEntries().entrySet()) {
+				if (entry.getValue().contains((Block) (Object) this)) {
+					cachedTags.add(entry.getKey());
+				}
+			}
+
+			this.tagVersion = BlockTagsAccessor.getLatestVersion();
+		}
+
+		return this.cachedTags;
+	}
+}

patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/MixinBedBlock.java

@@ -0,0 +1,28 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package net.patchworkmc.mixin.extensions.block;
+
+import org.spongepowered.asm.mixin.Mixin;
+import net.minecraftforge.common.extensions.IForgeBlockState;
+
+import net.minecraft.block.BlockState;
+
+@Mixin(BlockState.class)
+public class MixinBlockState implements IForgeBlockState { }

patchwork-extensions-block/src/main/java/net/patchworkmc/mixin/extensions/block/MixinBlock.java

@@ -0,0 +1,23 @@
+{
+  "schemaVersion": 1,
+  "id": "patchwork-extensions-block",
+  "version": "${version}",
+  "icon": "assets/patchwork-enum-hacks/icon.png",
+  "name": "Patchwork Extensions Block",
+  "description": "Implementation of Forge's block extensions",
+  "authors": [
+    "PatchworkMC"
+  ],
+  "license": "LGPL-2.1-only",
+  "environment": "*",
+  "depends": {
+    "fabricloader": ">=0.4.0"
+  },
+  "mixins": [
+    "patchwork-extensions-block.mixins.json"
+  ],
+  "custom": {
+    "modmenu:api": true,
+    "modmenu:parent": "patchwork"
+  }
+}