Merge pull request #23 from Theta-Dev/update1.3

Update1.3 -> 1.14

README.md

@@ -37,7 +37,7 @@ Every wand has two additional options that can be changed using keys. (Standard:
 
 ![](https://raw.githubusercontent.com/Theta-Dev/ConstructionWand/1.15/images/placedir.png)
 
-**Fluid lock:** Enables/disables the replacement of fluid blocks (both source + flowing).
+**Replacement:** Enables/disables the replacement of replaceable blocks (snow, tallgrass and fluids).
 
 ## Additional features
 - If you have shulker boxes in your inventory filled with blocks, the wand can pull them out and place them
@@ -50,4 +50,4 @@ Every wand has two additional options that can be changed using keys. (Standard:
 
 - Look at your statisics to see how many blocks you have placed using your wand
 
-- **1.16 only:** The Infinity Wand won't burn in lava just like netherite gear.
+- **1.16 only:** The Infinity Wand won't burn in lava just like netherite gear.

build.gradle

@@ -97,13 +97,19 @@ dependencies {
             name   : "forge",
             version: "${project.mcversion}-${project.forgeversion}"
     ])
-
+    /*
     compileOnly fg.deobf([
             group: "vazkii.botania",
             name: "Botania",
             version: "${project.botania}",
             classifier: "api"
-    ])
+    ])*/
+
+    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.14.4-1.1-25.135")
+    runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.14.4-1.0.6.1")
+
+    compileOnly fg.deobf("vazkii.botania:Botania:r1.11-379.354:api")
+    runtimeOnly fg.deobf("vazkii.botania:Botania:r1.11-379.354")
 }
 
 jar {

gradle.properties

@@ -4,11 +4,11 @@ org.gradle.daemon=false
 author=thetadev
 modid=constructionwand
 
-mcversion=1.16.2
+mcversion=1.14.4
-forgeversion=33.0.60
+forgeversion=28.2.23
-mcp_mappings=20200723-1.16.1
+mcp_mappings=20190719-1.14.3
 
-botania=1.16.2-405
+botania=r1.11-379.354
 
 version_major=1
 version_minor=3

src/generated/resources/data/constructionwand/advancements/recipes/tools/stone_wand.json

@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:stone_tool_materials"
+            "tag": "forge:cobblestone"
           }
         ]
       }

src/generated/resources/data/constructionwand/recipes/stone_wand.json

@@ -7,7 +7,7 @@
   ],
   "key": {
     "X": {
-      "tag": "minecraft:stone_tool_materials"
+      "tag": "forge:cobblestone"
     },
     "#": {
       "tag": "forge:rods/wooden"

src/main/java/thetadev/constructionwand/ConstructionWand.java

@@ -19,7 +19,6 @@ import thetadev.constructionwand.basics.ReplacementRegistry;
 import thetadev.constructionwand.client.RenderBlockPreview;
 import thetadev.constructionwand.containers.ContainerManager;
 import thetadev.constructionwand.containers.ContainerRegistrar;
-import thetadev.constructionwand.items.ModItems;
 import thetadev.constructionwand.job.JobHistory;
 import thetadev.constructionwand.network.PacketQueryUndo;
 import thetadev.constructionwand.network.PacketUndoBlocks;
@@ -80,7 +79,6 @@ public class ConstructionWand
     {
         renderBlockPreview = new RenderBlockPreview();
         MinecraftForge.EVENT_BUS.register(renderBlockPreview);
-        ModItems.registerModelProperties();
     }
 
     public static ResourceLocation loc(String name) {

src/main/java/thetadev/constructionwand/basics/WandUtil.java

@@ -6,8 +6,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.vector.Vector3d;
 import thetadev.constructionwand.ConstructionWand;
 import thetadev.constructionwand.items.ItemWand;
 
@@ -37,16 +36,8 @@ public class WandUtil
 		return null;
 	}
 
-	public static BlockPos playerPos(PlayerEntity player) {
+	public static Vec3d entityPositionVec(Entity entity) {
-		return new BlockPos(player.getPositionVec());
+		return new Vec3d(entity.posX, entity.posY - entity.getYOffset() + entity.getHeight()/2, entity.posZ);
-	}
-	
-	public static Vector3d entityPositionVec(Entity entity) {
-		return new Vector3d(entity.getPosX(), entity.getPosY() - entity.getYOffset() + entity.getHeight()/2, entity.getPosZ());
-	}
-
-	public static Vector3d blockPosVec(BlockPos pos) {
-		return new Vector3d(pos.getX(), pos.getY(), pos.getZ());
 	}
 
 	public static List<ItemStack> getHotbar(PlayerEntity player) {

src/main/java/thetadev/constructionwand/basics/option/WandOptions.java

@@ -53,7 +53,7 @@ public class WandOptions
 
 		mode = new OptionEnum<>(tag, "mode", MODE.class, MODE.DEFAULT, ConfigServer.getWandProperties(wand).getAngel() > 0);
 		lock = new OptionEnum<>(tag, "lock", LOCK.class, LOCK.NOLOCK);
-		direction = new OptionEnum<>(tag, "direction", DIRECTION.class, DIRECTION.PLAYER);
+		direction = new OptionEnum<>(tag, "direction", DIRECTION.class, DIRECTION.TARGET);
 		replace = new OptionBoolean(tag, "replace", true);
 		match = new OptionEnum<>(tag, "match", MATCH.class, MATCH.SIMILAR);
 		random = new OptionBoolean(tag, "random", false);

src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java

@@ -1,11 +1,9 @@
 package thetadev.constructionwand.client;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -13,7 +11,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraftforge.client.event.DrawHighlightEvent;
+import net.minecraftforge.client.event.DrawBlockHighlightEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import thetadev.constructionwand.basics.WandUtil;
 import thetadev.constructionwand.job.WandJob;
@@ -26,7 +24,7 @@ public class RenderBlockPreview
 	public Set<BlockPos> undoBlocks;
 
 	@SubscribeEvent
-	public void renderBlockHighlight(DrawHighlightEvent event)
+	public void renderBlockHighlight(DrawBlockHighlightEvent event)
 	{
 		if(event.getTarget().getType() != RayTraceResult.Type.BLOCK) return;
 
@@ -54,24 +52,46 @@ public class RenderBlockPreview
 
 		if(blocks == null || blocks.isEmpty()) return;
 
-		renderBlockList(blocks, event.getMatrix(), event.getBuffers(), colorR, colorG, colorB);
+		for(BlockPos block : blocks) {
+			double partialTicks = event.getPartialTicks();
+			double d0 = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks;
+			double d1 = player.lastTickPosY + player.getEyeHeight() + (player.posY - player.lastTickPosY) * partialTicks;
+			double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks;
+
+			AxisAlignedBB aabb = new AxisAlignedBB(block).offset(-d0, -d1, -d2);
+			drawBoundingBox(aabb, colorR, colorG, colorB, 0.4F);
+		}
 
 		event.setCanceled(true);
 	}
 
-	private void renderBlockList(Set<BlockPos> blocks, MatrixStack ms, IRenderTypeBuffer buffer, float red, float green, float blue) {
+	private static void drawBoundingBox(AxisAlignedBB box, float red, float green, float blue, float alpha) {
-		double renderPosX = Minecraft.getInstance().getRenderManager().info.getProjectedView().getX();
+		Tessellator tessellator = Tessellator.getInstance();
-		double renderPosY = Minecraft.getInstance().getRenderManager().info.getProjectedView().getY();
+		BufferBuilder buffer = tessellator.getBuffer();
-		double renderPosZ = Minecraft.getInstance().getRenderManager().info.getProjectedView().getZ();
+		buffer.begin(3, DefaultVertexFormats.POSITION_COLOR);
 
-		ms.push();
+		//Base
-		ms.translate(-renderPosX, -renderPosY, -renderPosZ);
+		buffer.pos(box.minX, box.minY, box.minZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.maxX, box.minY, box.minZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.maxX, box.minY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.minX, box.minY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.minX, box.minY, box.minZ).color(red, green, blue, alpha).endVertex();
+		//Side1
+		buffer.pos(box.minX, box.maxY, box.minZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.minX, box.maxY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.minX, box.minY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		//Side2
+		buffer.pos(box.minX, box.maxY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.maxX, box.maxY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.maxX, box.minY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		//Side3
+		buffer.pos(box.maxX, box.maxY, box.maxZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.maxX, box.maxY, box.minZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.maxX, box.minY, box.minZ).color(red, green, blue, alpha).endVertex();
+		//Side4
+		buffer.pos(box.maxX, box.maxY, box.minZ).color(red, green, blue, alpha).endVertex();
+		buffer.pos(box.minX, box.maxY, box.minZ).color(red, green, blue, alpha).endVertex();
 
-		for(BlockPos block : blocks) {
+		tessellator.draw();
-			AxisAlignedBB aabb = new AxisAlignedBB(block);
-			IVertexBuilder lineBuilder = buffer.getBuffer(RenderTypes.TRANSLUCENT_LINES);
-			WorldRenderer.drawBoundingBox(ms, lineBuilder, aabb, red, green, blue, 0.4F);
-		}
-		ms.pop();
 	}
 }

src/main/java/thetadev/constructionwand/client/RenderTypes.java

@@ -1,37 +0,0 @@
-package thetadev.constructionwand.client;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.renderer.RenderState;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import org.lwjgl.opengl.GL11;
-import thetadev.constructionwand.ConstructionWand;
-
-import java.util.OptionalDouble;
-
-public class RenderTypes
-{
-	public static final RenderType TRANSLUCENT_LINES;
-
-	protected static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY = new RenderState.TransparencyState("translucent_transparency", () -> {
-		RenderSystem.enableBlend();
-		RenderSystem.defaultBlendFunc();
-	}, RenderSystem::disableBlend);
-	protected static final RenderState.DepthTestState DEPTH_ALWAYS = new RenderState.DepthTestState("always", GL11.GL_ALWAYS);
-
-	static {
-		RenderType.State translucentNoDepthState = RenderType.State.getBuilder().transparency(TRANSLUCENT_TRANSPARENCY)
-				.line(new RenderState.LineState(OptionalDouble.of(2)))
-				.texture(new RenderState.TextureState())
-				.depthTest(DEPTH_ALWAYS)
-				.build(false);
-
-		TRANSLUCENT_LINES = RenderType.makeType(
-				ConstructionWand.MODID+":translucent_lines",
-				DefaultVertexFormats.POSITION_COLOR,
-				GL11.GL_LINES,
-				256,
-				translucentNoDepthState
-		);
-	}
-}

src/main/java/thetadev/constructionwand/client/ScreenWand.java

@@ -1,6 +1,5 @@
 package thetadev.constructionwand.client;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.button.Button;
@@ -13,10 +12,13 @@ import thetadev.constructionwand.basics.option.IOption;
 import thetadev.constructionwand.basics.option.WandOptions;
 import thetadev.constructionwand.network.PacketWandOption;
 
+import java.util.HashMap;
+
 public class ScreenWand extends Screen
 {
 	private final ItemStack wand;
 	private final WandOptions wandOptions;
+	private final HashMap<IOption<?>, Button> optionButtons;
 
 	private static final int BUTTON_WIDTH = 160;
 	private static final int BUTTON_HEIGHT = 20;
@@ -32,11 +34,13 @@ public class ScreenWand extends Screen
 		super(new StringTextComponent("ScreenWand"));
 		this.wand = wand;
 		wandOptions = new WandOptions(wand);
+		optionButtons = new HashMap<>();
 	}
 
 	@Override
 	public void init(Minecraft minecraft, int width, int height) {
 		super.init(minecraft, width, height);
+		optionButtons.clear();
 
 		createButton(0, 0, wandOptions.mode);
 		createButton(0, 1, wandOptions.lock);
@@ -47,33 +51,35 @@ public class ScreenWand extends Screen
 	}
 
 	@Override
-	public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+	public void render(int mouseX, int mouseY, float partialTicks) {
-		renderBackground(matrixStack);
+		renderBackground();
-		super.render(matrixStack, mouseX, mouseY, partialTicks);
+		super.render(mouseX, mouseY, partialTicks);
-		drawCenteredString(matrixStack, font, wand.getDisplayName(), width/2, height/2 - FIELD_HEIGHT/2 - SPACING_HEIGHT, 16777215);
+		drawCenteredString(font, wand.getDisplayName().getFormattedText(), width/2, height/2 - FIELD_HEIGHT/2 - SPACING_HEIGHT, 16777215);
+		optionButtons.forEach((opt, but) -> drawTooltip(mouseX, mouseY, opt, but));
 	}
 
 	@Override
 	public boolean charTyped(char character, int code) {
-		if(character == 'e') closeScreen();
+		if(character == 'e') onClose();
 		return super.charTyped(character, code);
 	}
 
 	private void createButton(int cx, int cy, IOption<?> option) {
-		Button button = new Button(getX(cx), getY(cy), BUTTON_WIDTH, BUTTON_HEIGHT, getButtonLabel(option), bt -> clickButton(bt, option), (bt, ms, x, y) -> drawTooltip(ms, x, y, option));
+		Button button = new Button(getX(cx), getY(cy), BUTTON_WIDTH, BUTTON_HEIGHT, getButtonLabel(option).getFormattedText(), bt -> clickButton(bt, option));
 		button.active = option.isEnabled();
 		addButton(button);
+		optionButtons.put(option, button);
 	}
 
 	private void clickButton(Button button, IOption<?> option) {
 		option.next();
 		ConstructionWand.instance.HANDLER.sendToServer(new PacketWandOption(option, false));
-		button.setMessage(getButtonLabel(option));
+		button.setMessage(getButtonLabel(option).getFormattedText());
 	}
 
-	private void drawTooltip(MatrixStack matrixStack, int mouseX, int mouseY, IOption<?> option) {
+	private void drawTooltip(int mouseX, int mouseY, IOption<?> option, Button button) {
-		if(isMouseOver(mouseX, mouseY)) {
+		if(button.isHovered()) {
-			renderTooltip(matrixStack, new TranslationTextComponent(option.getDescTranslation()), mouseX, mouseY);
+			renderTooltip(new TranslationTextComponent(option.getDescTranslation()).getFormattedText(), mouseX, mouseY);
 		}
 	}
 
@@ -86,6 +92,6 @@ public class ScreenWand extends Screen
 	}
 
 	private ITextComponent getButtonLabel(IOption<?> option) {
-		return new TranslationTextComponent(option.getKeyTranslation()).append(new TranslationTextComponent(option.getValueTranslation()));
+		return new TranslationTextComponent(option.getKeyTranslation()).appendSibling(new TranslationTextComponent(option.getValueTranslation()));
 	}
 }

src/main/java/thetadev/constructionwand/data/Inp.java

@@ -3,7 +3,7 @@ package thetadev.constructionwand.data;
 import net.minecraft.advancements.criterion.ItemPredicate;
 import net.minecraft.item.Item;
 import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.tags.ITag;
+import net.minecraft.tags.Tag;
 import net.minecraft.util.IItemProvider;
 
 public class Inp
@@ -21,7 +21,7 @@ public class Inp
 	public static Inp fromItem(IItemProvider in) {
 		return new Inp(in.asItem().getRegistryName().getPath(), Ingredient.fromItems(in), ItemPredicate.Builder.create().item(in).build());
 	}
-	public static Inp fromTag(ITag.INamedTag<Item> in) {
+	public static Inp fromTag(Tag<Item> in) {
-		return new Inp(in.getName().getPath(), Ingredient.fromTag(in), ItemPredicate.Builder.create().tag(in).build());
+		return new Inp(in.getId().getPath(), Ingredient.fromTag(in), ItemPredicate.Builder.create().tag(in).build());
 	}
 }

src/main/java/thetadev/constructionwand/data/RecipeGenerator.java

@@ -4,7 +4,6 @@ import net.minecraft.data.DataGenerator;
 import net.minecraft.data.IFinishedRecipe;
 import net.minecraft.data.RecipeProvider;
 import net.minecraft.data.ShapedRecipeBuilder;
-import net.minecraft.tags.ItemTags;
 import net.minecraft.util.IItemProvider;
 import net.minecraftforge.common.Tags;
 import thetadev.constructionwand.ConstructionWand;
@@ -20,7 +19,7 @@ public class RecipeGenerator extends RecipeProvider
 
 	@Override
 	protected void registerRecipes(Consumer<IFinishedRecipe> consumer) {
-		wandRecipe(consumer, ModItems.WAND_STONE, Inp.fromTag(ItemTags.field_232909_aa_)); //stone_tool_materials
+		wandRecipe(consumer, ModItems.WAND_STONE, Inp.fromTag(Tags.Items.COBBLESTONE));
 		wandRecipe(consumer, ModItems.WAND_IRON, Inp.fromTag(Tags.Items.INGOTS_IRON));
 		wandRecipe(consumer, ModItems.WAND_DIAMOND, Inp.fromTag(Tags.Items.GEMS_DIAMOND));
 		wandRecipe(consumer, ModItems.WAND_INFINITY, Inp.fromTag(Tags.Items.NETHER_STARS));

src/main/java/thetadev/constructionwand/items/ItemWand.java

@@ -1,7 +1,6 @@
 package thetadev.constructionwand.items;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.PlayerEntity;
@@ -12,6 +11,7 @@ import net.minecraft.item.ItemUseContext;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Hand;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
@@ -34,6 +34,7 @@ public abstract class ItemWand extends Item
 	public ItemWand(String name, Item.Properties properties) {
 		super(properties.group(ItemGroup.TOOLS));
 		setRegistryName(ConstructionWand.loc(name));
+		addPropertyOverride(new ResourceLocation(ConstructionWand.MODID, "wand_mode"), (stack, worldIn, entityIn) -> getWandMode(stack));
 	}
 
 	@Override
@@ -64,14 +65,14 @@ public abstract class ItemWand extends Item
 		ItemStack stack = player.getHeldItem(hand);
 
 		if(!player.isSneaking()) {
-			if(world.isRemote) return ActionResult.resultFail(stack);
+			if(world.isRemote) return new ActionResult<>(ActionResultType.FAIL, stack);
 
 			// Right click: Place angel block
 			//ConstructionWand.LOGGER.debug("Place angel block");
 			WandJob job = new AngelJob(player, world, stack);
-			return job.doIt() ? ActionResult.resultSuccess(stack) : ActionResult.resultFail(stack);
+			return new ActionResult<>(job.doIt() ? ActionResultType.SUCCESS : ActionResultType.FAIL, stack);
 		}
-		return ActionResult.resultFail(stack);
+		return new ActionResult<>(ActionResultType.FAIL, stack);
 	}
 
 	@Override
@@ -107,26 +108,26 @@ public abstract class ItemWand extends Item
 		if(Screen.hasShiftDown()) {
 			for(int i=1; i<options.allOptions.length; i++) {
 				IOption<?> opt = options.allOptions[i];
-				lines.add(new TranslationTextComponent(opt.getKeyTranslation()).mergeStyle(TextFormatting.AQUA)
+				lines.add(new TranslationTextComponent(opt.getKeyTranslation()).applyTextStyle(TextFormatting.AQUA)
-						.append(new TranslationTextComponent(opt.getValueTranslation()).mergeStyle(TextFormatting.GRAY))
+						.appendSibling(new TranslationTextComponent(opt.getValueTranslation()).applyTextStyle(TextFormatting.GRAY))
 				);
 			}
 		}
 		else {
 			IOption<?> opt = options.allOptions[0];
-			lines.add(new TranslationTextComponent(langTooltip + "blocks", getLimit()).mergeStyle(TextFormatting.GRAY));
+			lines.add(new TranslationTextComponent(langTooltip + "blocks", getLimit()).applyTextStyle(TextFormatting.GRAY));
-			lines.add(new TranslationTextComponent(opt.getKeyTranslation()).mergeStyle(TextFormatting.AQUA)
+			lines.add(new TranslationTextComponent(opt.getKeyTranslation()).applyTextStyle(TextFormatting.AQUA)
-					.append(new TranslationTextComponent(opt.getValueTranslation()).mergeStyle(TextFormatting.WHITE)));
+					.appendSibling(new TranslationTextComponent(opt.getValueTranslation()).applyTextStyle(TextFormatting.WHITE)));
-			lines.add(new TranslationTextComponent(langTooltip + "shift").mergeStyle(TextFormatting.AQUA));
+			lines.add(new TranslationTextComponent(langTooltip + "shift").applyTextStyle(TextFormatting.AQUA));
 		}
 	}
 
 	public static void optionMessage(PlayerEntity player, IOption<?> option) {
 		player.sendStatusMessage(
-				new TranslationTextComponent(option.getKeyTranslation()).mergeStyle(TextFormatting.AQUA)
+				new TranslationTextComponent(option.getKeyTranslation()).applyTextStyle(TextFormatting.AQUA)
-						.append(new TranslationTextComponent(option.getValueTranslation()).mergeStyle(TextFormatting.WHITE))
+						.appendSibling(new TranslationTextComponent(option.getValueTranslation()).applyTextStyle(TextFormatting.WHITE))
-						.append(new StringTextComponent(" - ").mergeStyle(TextFormatting.GRAY))
+						.appendSibling(new StringTextComponent(" - ").applyTextStyle(TextFormatting.GRAY))
-						.append(new TranslationTextComponent(option.getDescTranslation()).mergeStyle(TextFormatting.WHITE))
+						.appendSibling(new TranslationTextComponent(option.getDescTranslation()).applyTextStyle(TextFormatting.WHITE))
 				, true);
 	}
 }

src/main/java/thetadev/constructionwand/items/ItemWandBasic.java

@@ -2,12 +2,7 @@ package thetadev.constructionwand.items;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.IItemTier;
-import net.minecraft.item.Item;
-import net.minecraft.item.Item.Properties;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.tags.ItemTags;
-import net.minecraft.util.ResourceLocation;
 import thetadev.constructionwand.basics.ConfigServer;
 
 public class ItemWandBasic extends ItemWand

src/main/java/thetadev/constructionwand/items/ItemWandInfinity.java

@@ -9,7 +9,7 @@ public class ItemWandInfinity extends ItemWand
 {
 	public ItemWandInfinity(String name)
 	{
-		super(name, new Properties().maxStackSize(1).isBurnable());
+		super(name, new Properties().maxStackSize(1));
 	}
 
 	@Override

src/main/java/thetadev/constructionwand/items/ModItems.java

@@ -1,7 +1,6 @@
 package thetadev.constructionwand.items;
 
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemModelsProperties;
 import net.minecraft.item.ItemTier;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.event.RegistryEvent;
@@ -26,13 +25,4 @@ public class ModItems
 	{
 		event.getRegistry().registerAll(WANDS);
 	}
-
-	public static void registerModelProperties() {
-		for(Item item : WANDS) {
-			ItemModelsProperties.func_239418_a_(
-					item, new ResourceLocation(ConstructionWand.MODID, "wand_mode"),
-					(stack, world, entity) -> entity == null || !(stack.getItem() instanceof ItemWand) ? 0 : ItemWand.getWandMode(stack)
-			);
-		}
-	}
 }

src/main/java/thetadev/constructionwand/job/AngelJob.java

@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import thetadev.constructionwand.basics.ConfigServer;
 import thetadev.constructionwand.basics.WandUtil;
@@ -15,10 +15,10 @@ import thetadev.constructionwand.basics.option.WandOptions;
 public class AngelJob extends WandJob
 {
 	public AngelJob(PlayerEntity player, World world, ItemStack wand) {
-		super(player, world, new BlockRayTraceResult(player.getLookVec(), fromVector(player.getLookVec()), WandUtil.playerPos(player), false), wand);
+		super(player, world, new BlockRayTraceResult(player.getLookVec(), fromVector(player.getLookVec()), player.getPosition(), false), wand);
 	}
 
-	private static Direction fromVector(Vector3d vector) {
+	private static Direction fromVector(Vec3d vector) {
 		return Direction.getFacingFromVector(vector.x, vector.y, vector.z);
 	}
 
@@ -28,9 +28,9 @@ public class AngelJob extends WandJob
 
 		if(!player.isCreative() && !ConfigServer.ANGEL_FALLING.get() && player.fallDistance > 10) return;
 
-		Vector3d playerVec = WandUtil.entityPositionVec(player);
+		Vec3d playerVec = WandUtil.entityPositionVec(player);
-		Vector3d lookVec = player.getLookVec().mul(2, 2, 2);
+		Vec3d lookVec = player.getLookVec().mul(2, 2, 2);
-		Vector3d placeVec = playerVec.add(lookVec);
+		Vec3d placeVec = playerVec.add(lookVec);
 
 		BlockPos currentPos = new BlockPos(placeVec);
 

src/main/java/thetadev/constructionwand/job/WandItemUseContext.java

@@ -6,8 +6,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
-import thetadev.constructionwand.basics.WandUtil;
 
 public class WandItemUseContext extends BlockItemUseContext
 {
@@ -15,10 +14,9 @@ public class WandItemUseContext extends BlockItemUseContext
 		super(job.world, job.player, Hand.MAIN_HAND, new ItemStack(item), new BlockRayTraceResult(getBlockHitVec(job, pos), job.rayTraceResult.getFace(), pos, false));
 	}
 
-	private static Vector3d getBlockHitVec(WandJob job, BlockPos pos) {
+	private static Vec3d getBlockHitVec(WandJob job, BlockPos pos) {
-		Vector3d hitVec = job.rayTraceResult.getHitVec(); // Absolute coords of hit target
+		Vec3d hitVec = job.rayTraceResult.getHitVec(); // Absolute coords of hit target
-
+		Vec3d blockDelta = new Vec3d(job.rayTraceResult.getPos()).subtract(new Vec3d(pos)); // Vector between start and current block
-		Vector3d blockDelta = WandUtil.blockPosVec(job.rayTraceResult.getPos()).subtract(WandUtil.blockPosVec(pos)); // Vector between start and current block
 
 		return blockDelta.add(hitVec); // Absolute coords of current block hit target
 	}

src/main/java/thetadev/constructionwand/job/WandJob.java

@@ -4,7 +4,7 @@ import net.minecraft.block.*;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.*;
-import net.minecraft.state.Property;
+import net.minecraft.state.IProperty;
 import net.minecraft.state.properties.BlockStateProperties;
 import net.minecraft.state.properties.SlabType;
 import net.minecraft.stats.Stats;
@@ -248,17 +248,17 @@ public abstract class WandJob
 		// Copy certain properties of supporting block (save the effort when running preview on client)
 		if(options.direction.get() == WandOptions.DIRECTION.TARGET && !world.isRemote) {
 			// Block properties to be copied (alignment/rotation properties)
-			for(Property property : new Property[] {
+			for(IProperty property : new IProperty[] {
 					BlockStateProperties.HORIZONTAL_FACING, BlockStateProperties.FACING, BlockStateProperties.FACING_EXCEPT_UP,
 					BlockStateProperties.ROTATION_0_15, BlockStateProperties.AXIS, BlockStateProperties.HALF, BlockStateProperties.STAIRS_SHAPE})
 			{
-				if(supportingBlock.hasProperty(property) && placeBlock.hasProperty(property)) {
+				if(supportingBlock.has(property) && placeBlock.has(property)) {
 					placeBlock = placeBlock.with(property, supportingBlock.get(property));
 				}
 			}
 
 			// Dont dupe double slabs
-			if(supportingBlock.hasProperty(BlockStateProperties.SLAB_TYPE) && placeBlock.hasProperty(BlockStateProperties.SLAB_TYPE)) {
+			if(supportingBlock.has(BlockStateProperties.SLAB_TYPE) && placeBlock.has(BlockStateProperties.SLAB_TYPE)) {
 				SlabType slabType = supportingBlock.get(BlockStateProperties.SLAB_TYPE);
 				if(slabType != SlabType.DOUBLE) placeBlock = placeBlock.with(BlockStateProperties.SLAB_TYPE, slabType);
 			}
@@ -295,23 +295,18 @@ public abstract class WandJob
 		BlockPos blockPos = placeSnapshot.pos;
 		BlockState placeBlock = placeSnapshot.block;
 
+		// Abort if placeEvent is canceled
+		BlockSnapshot snapshot = new BlockSnapshot(world, blockPos, placeBlock);
+		BlockEvent.EntityPlaceEvent placeEvent = new BlockEvent.EntityPlaceEvent(snapshot, placeBlock, player);
+		MinecraftForge.EVENT_BUS.post(placeEvent);
+		if(placeEvent.isCanceled()) return false;
+
 		// Place the block
 		if(!world.setBlockState(blockPos, placeBlock)) {
 			ConstructionWand.LOGGER.info("Block could not be placed");
 			return false;
 		}
-
+		world.notifyNeighbors(blockPos, placeBlock.getBlock());
-		// Remove block if placeEvent is canceled
-		BlockSnapshot snapshot = BlockSnapshot.create(world.func_234923_W_(), world, blockPos);
-		BlockEvent.EntityPlaceEvent placeEvent = new BlockEvent.EntityPlaceEvent(snapshot, placeBlock, player);
-		MinecraftForge.EVENT_BUS.post(placeEvent);
-		if(placeEvent.isCanceled()) {
-			world.removeBlock(blockPos, false);
-			return false;
-		}
-
-		// Update neighbor block states
-		world.notifyNeighborsOfStateChange(blockPos, placeBlock.getBlock());
 
 		// Update stats
 		player.addStat(Stats.ITEM_USED.get(placeSnapshot.item));
@@ -354,7 +349,7 @@ public abstract class WandJob
 		// Play place sound
 		if(!placeSnapshots.isEmpty()) {
 			SoundType sound = placeSnapshots.getFirst().block.getSoundType();
-			world.playSound(null, WandUtil.playerPos(player), sound.getPlaceSound(), SoundCategory.BLOCKS, sound.volume, sound.pitch);
+			world.playSound(null, player.getPosition(), sound.getPlaceSound(), SoundCategory.BLOCKS, sound.volume, sound.pitch);
 		}
 
 		// Add to job history for undo
@@ -390,7 +385,7 @@ public abstract class WandJob
 
 		// Play teleport sound
 		SoundEvent sound = SoundEvents.ITEM_CHORUS_FRUIT_TELEPORT;
-		world.playSound(null, WandUtil.playerPos(player), sound, SoundCategory.PLAYERS, 1.0F, 1.0F);
+		world.playSound(null, player.getPosition(), sound, SoundCategory.PLAYERS, 1.0F, 1.0F);
 
 		return true;
 	}

src/main/resources/META-INF/mods.toml

@@ -1,13 +1,13 @@
 modLoader="javafml"
-loaderVersion="[33,)"
 license="MIT License"
+loaderVersion="[28,)"
 [[mods]]
 modId="constructionwand"
 version="${file.jarVersion}"
 displayName="Construction Wand"
 displayURL="https://github.com/Theta-Dev/ConstructionWand" #optional
-logoFile="logo.png" #optional
+logoFile="logo.png"
-authors="ThetaDev" #optional
+authors="ThetaDev"
 description='''
 Construction Wands make building easier!
 
@@ -20,12 +20,12 @@ This is my first minecraft mod. May the odds be ever in your favor.
 [[dependencies.constructionwand]]
     modId="forge"
     mandatory=true
-    versionRange="[33,)"
+    versionRange="[28,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.constructionwand]]
     modId="minecraft"
     mandatory=true
-    versionRange="[1.16.2, 1.16.3]"
+    versionRange="[1.14.4]"
     ordering="NONE"
     side="BOTH"