From c96feedb9152744a34b9f54289456317ea5621d7 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Sun, 2 Aug 2020 16:56:49 +0200 Subject: [PATCH 1/8] Changed version to 1.14 --- build.gradle | 12 ++++++------ src/main/resources/META-INF/mods.toml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 425ef7d..e0a9f3e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.15-1.0' +version = '1.14-1.0' group = 'thetadev.constructionwand' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'constructionwand' @@ -25,7 +25,7 @@ minecraft { // stable_# Stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'snapshot', version: '20200514-1.15.1' + mappings channel: 'snapshot', version: '20190719-1.14.3' // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -98,14 +98,14 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.15.2-31.2.31' + minecraft 'net.minecraftforge:forge:1.14.4-28.2.23' - runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.160") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0.2.4") + //runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.160") + //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0.2.4") compileOnly fg.deobf("vazkii.botania:Botania:r1.15-387.455:api") - runtimeOnly fg.deobf("vazkii.botania:Botania:r1.15-387.455") + //runtimeOnly fg.deobf("vazkii.botania:Botania:r1.15-387.455") // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 15fdc84..573e6d5 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[28,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # A URL to refer people to when problems occur with this mod #issueTrackerURL="https://github.com/Theta-Dev/ConstructionWand" #optional # A list of mods - how many allowed here is determined by the individual mod loader @@ -35,24 +35,24 @@ With a Construction Wand you can place multiple blocks (up to 1024) at once, ext Sneak+Right click to activate angel mode which allows you to place a block at the opposite side of the block facing you. If you concentrate enough, you can even conjure a block in mid air! -This is my first minecraft mod. May the odds be ever in your favor! +This is my first minecraft mod. May the odds be ever in your favor. ''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.examplemod]] #optional +[[dependencies.constructionwand]] #optional # the modid of the dependency modId="forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[31,)" #mandatory + versionRange="[28,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER side="BOTH" # Here's another dependency -[[dependencies.examplemod]] +[[dependencies.constructionwand]] modId="minecraft" mandatory=true - versionRange="[1.15.2]" + versionRange="[1.14.4]" ordering="NONE" side="BOTH" From 36fa9efb32c1ecc41a8d8b017bbcdb7e7c658aad Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Sun, 2 Aug 2020 16:59:41 +0200 Subject: [PATCH 2/8] Changed version to 1.14 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e0a9f3e..94de9a9 100644 --- a/build.gradle +++ b/build.gradle @@ -103,7 +103,7 @@ dependencies { //runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.160") //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0.2.4") - compileOnly fg.deobf("vazkii.botania:Botania:r1.15-387.455:api") + compileOnly fg.deobf("vazkii.botania:Botania:r1.11-379.354:api") //runtimeOnly fg.deobf("vazkii.botania:Botania:r1.15-387.455") From d3eaa2250585f1728062fb7d8b68a1ce83b7df48 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Sun, 2 Aug 2020 17:41:30 +0200 Subject: [PATCH 3/8] Ported to 1.14 --- build.gradle | 7 ++-- .../constructionwand/client/KeyEvents.java | 2 +- .../client/RenderBlockPreview.java | 23 +++--------- .../constructionwand/client/RenderTypes.java | 37 ------------------- .../constructionwand/items/ItemWand.java | 6 +-- 5 files changed, 13 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/thetadev/constructionwand/client/RenderTypes.java diff --git a/build.gradle b/build.gradle index 94de9a9..71f9c48 100644 --- a/build.gradle +++ b/build.gradle @@ -100,12 +100,11 @@ dependencies { // The userdev artifact is a special name and will get all sorts of transformations applied to it. minecraft 'net.minecraftforge:forge:1.14.4-28.2.23' - //runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-32.160") - //runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.15.2-2.0.2.4") + 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.15-387.455") + runtimeOnly fg.deobf("vazkii.botania:Botania:r1.11-379.354") // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" diff --git a/src/main/java/thetadev/constructionwand/client/KeyEvents.java b/src/main/java/thetadev/constructionwand/client/KeyEvents.java index 21a7e03..56581f1 100644 --- a/src/main/java/thetadev/constructionwand/client/KeyEvents.java +++ b/src/main/java/thetadev/constructionwand/client/KeyEvents.java @@ -74,7 +74,7 @@ public class KeyEvents // Send undo blocks to player sneaking with wand @SubscribeEvent public void sneak(InputUpdateEvent e) { - if(e.getMovementInput().sneaking) { + if(e.getMovementInput().sneak) { PlayerEntity player = e.getPlayer(); if(WandUtil.holdingWand(player) == null) return; diff --git a/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java b/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java index a399141..d82320c 100644 --- a/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java +++ b/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java @@ -1,8 +1,5 @@ package thetadev.constructionwand.client; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -11,11 +8,9 @@ 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.ConstructionWand; import thetadev.constructionwand.basics.WandUtil; -import thetadev.constructionwand.job.ConstructionJob; import thetadev.constructionwand.job.WandJob; import java.util.LinkedList; @@ -26,7 +21,7 @@ public class RenderBlockPreview public LinkedList undoBlocks; @SubscribeEvent - public void renderAdditionalBlockBounds(DrawHighlightEvent event) + public void renderAdditionalBlockBounds(DrawBlockHighlightEvent event) { if(event.getTarget().getType() != RayTraceResult.Type.BLOCK) return; @@ -53,22 +48,16 @@ public class RenderBlockPreview if(blocks == null || blocks.isEmpty()) return; - MatrixStack ms = event.getMatrix(); - IRenderTypeBuffer buffer = event.getBuffers(); - ms.push(); - for(BlockPos block : blocks) { double partialTicks = event.getPartialTicks(); - double d0 = player.lastTickPosX + (player.getPosX() - player.lastTickPosX) * partialTicks; - double d1 = player.lastTickPosY + player.getEyeHeight() + (player.getPosY() - player.lastTickPosY) * partialTicks; - double d2 = player.lastTickPosZ + (player.getPosZ() - player.lastTickPosZ) * partialTicks; + 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); - IVertexBuilder lineBuilder = buffer.getBuffer(RenderTypes.TRANSLUCENT_LINES); - WorldRenderer.drawBoundingBox(ms, lineBuilder, aabb, colorR, colorG, colorB, 0.4F); + WorldRenderer.drawSelectionBoundingBox(aabb, colorR, colorG, colorB, 0.4F); } - ms.pop(); event.setCanceled(true); } diff --git a/src/main/java/thetadev/constructionwand/client/RenderTypes.java b/src/main/java/thetadev/constructionwand/client/RenderTypes.java deleted file mode 100644 index c3759b7..0000000 --- a/src/main/java/thetadev/constructionwand/client/RenderTypes.java +++ /dev/null @@ -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(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 - ); - } -} diff --git a/src/main/java/thetadev/constructionwand/items/ItemWand.java b/src/main/java/thetadev/constructionwand/items/ItemWand.java index 2277de7..a2e4e59 100644 --- a/src/main/java/thetadev/constructionwand/items/ItemWand.java +++ b/src/main/java/thetadev/constructionwand/items/ItemWand.java @@ -73,7 +73,7 @@ public abstract class ItemWand extends Item public ActionResult onItemRightClick(World world, PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); - if(world.isRemote) return ActionResult.resultFail(stack); + if(world.isRemote) return new ActionResult<>(ActionResultType.FAIL, stack); if(player.isSneaking()) { // SHIFT + Right click: Change wand mode @@ -86,13 +86,13 @@ public abstract class ItemWand extends Item optionMessage(player, opt); player.inventory.markDirty(); - return ActionResult.resultSuccess(stack); + return new ActionResult<>(ActionResultType.SUCCESS, stack); } else { // 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); } } From 493861f8c9c9a357dbb41abe336bd2851489c9da Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Sun, 2 Aug 2020 18:09:42 +0200 Subject: [PATCH 4/8] Improved Preview Renderer --- .../client/RenderBlockPreview.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java b/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java index d82320c..4fcf146 100644 --- a/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java +++ b/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java @@ -1,6 +1,9 @@ package thetadev.constructionwand.client; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -56,9 +59,40 @@ public class RenderBlockPreview double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks; AxisAlignedBB aabb = new AxisAlignedBB(block).offset(-d0, -d1, -d2); - WorldRenderer.drawSelectionBoundingBox(aabb, colorR, colorG, colorB, 0.4F); + //WorldRenderer.drawSelectionBoundingBox(aabb, colorR, colorG, colorB, 0.4F); + drawBoundingBox(aabb, colorR, colorG, colorB, 0.4F); } event.setCanceled(true); } + + private static void drawBoundingBox(AxisAlignedBB box, float red, float green, float blue, float alpha) { + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(3, DefaultVertexFormats.POSITION_COLOR); + + //Base + 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(); + + tessellator.draw(); + } } From dfbdb10a800183ba329a7fc686ed348d9deeb992 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Mon, 3 Aug 2020 00:57:48 +0200 Subject: [PATCH 5/8] Fixed key events --- .../constructionwand/client/KeyEvents.java | 22 ++++++++++--------- .../assets/constructionwand/lang/de_de.json | 1 + .../assets/constructionwand/lang/en_us.json | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/thetadev/constructionwand/client/KeyEvents.java b/src/main/java/thetadev/constructionwand/client/KeyEvents.java index f999acd..48bc90c 100644 --- a/src/main/java/thetadev/constructionwand/client/KeyEvents.java +++ b/src/main/java/thetadev/constructionwand/client/KeyEvents.java @@ -27,9 +27,11 @@ public class KeyEvents private final String langPrefix = ConstructionWand.MODID + ".key."; private final String langCategory = langPrefix + "category"; - public final KeyBinding[] keys = { - new KeyBinding(langPrefix+"direction", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_N, 0), langCategory), - new KeyBinding(langPrefix+"fluid", KeyConflictContext.IN_GAME, KeyModifier.SHIFT, InputMappings.getInputByCode(GLFW.GLFW_KEY_N, 0), langCategory) + public final KeyBinding WAND_KEY = new KeyBinding(langPrefix+"wand", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_N, 0), langCategory); + + public static final KeyModifier[] keyModifiers = { + KeyModifier.NONE, + KeyModifier.SHIFT }; public static final IEnumOption[] keyOptions = { @@ -38,17 +40,17 @@ public class KeyEvents }; public KeyEvents() { - for(KeyBinding key : keys) ClientRegistry.registerKeyBinding(key); + ClientRegistry.registerKeyBinding(WAND_KEY); } @SubscribeEvent public void KeyEvent(InputEvent.KeyInputEvent e) { - boolean sendPacket = false; - - for(int i=0; i Date: Mon, 3 Aug 2020 19:06:24 +0200 Subject: [PATCH 6/8] tiny fix --- .../thetadev/constructionwand/client/RenderBlockPreview.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java b/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java index d0132ce..ff96fe8 100644 --- a/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java +++ b/src/main/java/thetadev/constructionwand/client/RenderBlockPreview.java @@ -1,8 +1,8 @@ package thetadev.constructionwand.client; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -24,7 +24,7 @@ public class RenderBlockPreview public LinkedList undoBlocks; @SubscribeEvent - public void renderBlockHighlight(DrawHighlightEvent event) + public void renderBlockHighlight(DrawBlockHighlightEvent event) { if(event.getTarget().getType() != RayTraceResult.Type.BLOCK) return; From 2df50e381d3f986853b9f6a2a9e580daeae46bd5 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Mon, 3 Aug 2020 19:30:55 +0200 Subject: [PATCH 7/8] Fixed tooltip not showing angel mode --- src/main/java/thetadev/constructionwand/items/ItemWand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/thetadev/constructionwand/items/ItemWand.java b/src/main/java/thetadev/constructionwand/items/ItemWand.java index 1b72703..ec188a2 100644 --- a/src/main/java/thetadev/constructionwand/items/ItemWand.java +++ b/src/main/java/thetadev/constructionwand/items/ItemWand.java @@ -136,7 +136,7 @@ public abstract class ItemWand extends Item IEnumOption opt = WandOptions.options[0]; lines.add(new TranslationTextComponent(langTooltip + "blocks", wand.maxBlocks).applyTextStyle(TextFormatting.GRAY)); lines.add(new TranslationTextComponent(langPrefix+opt.getOptionKey()).applyTextStyle(TextFormatting.AQUA) - .appendSibling(new TranslationTextComponent(langPrefix+opt.getTranslationKey()).applyTextStyle(TextFormatting.WHITE))); + .appendSibling(new TranslationTextComponent(langPrefix+options.getOption(opt).getTranslationKey()).applyTextStyle(TextFormatting.WHITE))); lines.add(new TranslationTextComponent(langTooltip + "shift").applyTextStyle(TextFormatting.AQUA)); } } From e3d6f161a220a5938c9f4fedc664c71e6a9936c4 Mon Sep 17 00:00:00 2001 From: Theta-Dev Date: Mon, 3 Aug 2020 19:52:53 +0200 Subject: [PATCH 8/8] more tiny fixes --- src/main/java/thetadev/constructionwand/items/ItemWand.java | 2 +- src/main/java/thetadev/constructionwand/job/AngelJob.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/thetadev/constructionwand/items/ItemWand.java b/src/main/java/thetadev/constructionwand/items/ItemWand.java index ec188a2..e13f2fd 100644 --- a/src/main/java/thetadev/constructionwand/items/ItemWand.java +++ b/src/main/java/thetadev/constructionwand/items/ItemWand.java @@ -54,7 +54,7 @@ public abstract class ItemWand extends Item Hand hand = context.getHand(); World world = context.getWorld(); - if(world.isRemote) return ActionResultType.FAIL; + if(world.isRemote || player == null) return ActionResultType.FAIL; ItemStack stack = player.getHeldItem(hand); diff --git a/src/main/java/thetadev/constructionwand/job/AngelJob.java b/src/main/java/thetadev/constructionwand/job/AngelJob.java index 4e93be1..1c0b499 100644 --- a/src/main/java/thetadev/constructionwand/job/AngelJob.java +++ b/src/main/java/thetadev/constructionwand/job/AngelJob.java @@ -22,7 +22,7 @@ public class AngelJob extends WandJob @Override protected void getBlockPositionList() { - if(options.getOption(EnumMode.DEFAULT) != EnumMode.ANGEL) return; + if(options.getOption(EnumMode.DEFAULT) != EnumMode.ANGEL || wandItem.angelDistance == 0) return; if(!player.isCreative() && !ConfigHandler.ANGEL_FALLING.get() && player.fallDistance > 10) return;