diff --git a/src/main/java/nl/requios/effortlessbuilding/BuildConfig.java b/src/main/java/nl/requios/effortlessbuilding/BuildConfig.java index db4a312..8037156 100644 --- a/src/main/java/nl/requios/effortlessbuilding/BuildConfig.java +++ b/src/main/java/nl/requios/effortlessbuilding/BuildConfig.java @@ -50,7 +50,7 @@ public class BuildConfig { "A percentage between 0% and 100%, where 0% is the same as disabling it,", "and 100% takes as much time as breaking each block individually.", "The block in front of you always counts as 100%."}) - @RangeInt(min = 0, max = 100) + @RangeInt(min = 0, max = 200) public int miningTimePercentage = 50; } diff --git a/src/main/java/nl/requios/effortlessbuilding/BuildSettingsManager.java b/src/main/java/nl/requios/effortlessbuilding/BuildSettingsManager.java index 586bae7..c6ae224 100644 --- a/src/main/java/nl/requios/effortlessbuilding/BuildSettingsManager.java +++ b/src/main/java/nl/requios/effortlessbuilding/BuildSettingsManager.java @@ -5,6 +5,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import nl.requios.effortlessbuilding.buildmodifier.Array; +import nl.requios.effortlessbuilding.buildmodifier.Mirror; +import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager; import nl.requios.effortlessbuilding.helper.ReachHelper; import nl.requios.effortlessbuilding.network.BuildSettingsMessage; diff --git a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java index 54f68f4..9203727 100644 --- a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java @@ -18,6 +18,7 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers; import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager; import nl.requios.effortlessbuilding.helper.SurvivalHelper; diff --git a/src/main/java/nl/requios/effortlessbuilding/Array.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java similarity index 92% rename from src/main/java/nl/requios/effortlessbuilding/Array.java rename to src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java index 2aa40b2..48e5cdf 100644 --- a/src/main/java/nl/requios/effortlessbuilding/Array.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java @@ -1,4 +1,4 @@ -package nl.requios.effortlessbuilding; +package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -9,6 +9,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraftforge.items.IItemHandler; +import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import java.util.ArrayList; @@ -81,7 +82,8 @@ public class Array { //Randomizer bag synergy if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); - blockState = BuildModifiers.getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND); + blockState = BuildModifiers + .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND); } //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, ) diff --git a/src/main/java/nl/requios/effortlessbuilding/BuildModifiers.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java similarity index 98% rename from src/main/java/nl/requios/effortlessbuilding/BuildModifiers.java rename to src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java index 2e778bb..c3f22ad 100644 --- a/src/main/java/nl/requios/effortlessbuilding/BuildModifiers.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java @@ -1,9 +1,8 @@ -package nl.requios.effortlessbuilding; +package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; @@ -12,6 +11,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.event.world.BlockEvent; +import nl.requios.effortlessbuilding.BuildSettingsManager; +import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.helper.ReachHelper; import nl.requios.effortlessbuilding.helper.SurvivalHelper; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; diff --git a/src/main/java/nl/requios/effortlessbuilding/Mirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java similarity index 97% rename from src/main/java/nl/requios/effortlessbuilding/Mirror.java rename to src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java index 7767673..dad110b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/Mirror.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java @@ -1,4 +1,4 @@ -package nl.requios.effortlessbuilding; +package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.block.BlockDirectional; import net.minecraft.block.BlockDispenser; @@ -12,6 +12,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraftforge.items.IItemHandler; +import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import java.util.ArrayList; @@ -23,7 +24,7 @@ public class Mirror { public boolean enabled = false; public Vec3d position = new Vec3d(0.5, 64.5, 0.5); public boolean mirrorX = true, mirrorY = false, mirrorZ = false; - public int radius = 20; + public int radius = 10; public boolean drawLines = true, drawPlanes = true; public MirrorSettings() { @@ -114,7 +115,8 @@ public class Mirror { //Randomizer bag synergy if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); - oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand); + oldBlockState = BuildModifiers + .getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand); } //Find blockstate diff --git a/src/main/java/nl/requios/effortlessbuilding/RadialMirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java similarity index 96% rename from src/main/java/nl/requios/effortlessbuilding/RadialMirror.java rename to src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java index 1fcf834..1419e55 100644 --- a/src/main/java/nl/requios/effortlessbuilding/RadialMirror.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java @@ -1,4 +1,4 @@ -package nl.requios.effortlessbuilding; +package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -11,6 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraftforge.items.IItemHandler; +import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import java.util.ArrayList; @@ -123,7 +124,8 @@ public class RadialMirror { //Randomizer bag synergy if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); - newBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND); + newBlockState = BuildModifiers + .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND); newBlockState = rotateOriginalBlockState(startAngleToCenter, newBlockState); } diff --git a/src/main/java/nl/requios/effortlessbuilding/capability/BuildModifierCapabilityManager.java b/src/main/java/nl/requios/effortlessbuilding/capability/BuildModifierCapabilityManager.java index ef59466..1e2c954 100644 --- a/src/main/java/nl/requios/effortlessbuilding/capability/BuildModifierCapabilityManager.java +++ b/src/main/java/nl/requios/effortlessbuilding/capability/BuildModifierCapabilityManager.java @@ -11,10 +11,10 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import nl.requios.effortlessbuilding.Array; import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings; -import nl.requios.effortlessbuilding.Mirror; -import nl.requios.effortlessbuilding.RadialMirror; +import nl.requios.effortlessbuilding.buildmodifier.Array; +import nl.requios.effortlessbuilding.buildmodifier.Mirror; +import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/ArraySettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/ArraySettingsGui.java index 2b528b6..62c3204 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/ArraySettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/ArraySettingsGui.java @@ -5,9 +5,9 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.client.config.GuiCheckBox; -import nl.requios.effortlessbuilding.Array; import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.EffortlessBuilding; +import nl.requios.effortlessbuilding.buildmodifier.Array; import nl.requios.effortlessbuilding.helper.ReachHelper; import java.io.IOException; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/MirrorSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/MirrorSettingsGui.java index 4ef30d2..4c3dee5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/MirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/MirrorSettingsGui.java @@ -8,7 +8,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.client.config.GuiCheckBox; import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.Mirror; +import nl.requios.effortlessbuilding.buildmodifier.Mirror; import nl.requios.effortlessbuilding.helper.ReachHelper; import java.io.IOException; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/RadialMirrorSettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/RadialMirrorSettingsGui.java index 7573416..83dc81e 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/RadialMirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/RadialMirrorSettingsGui.java @@ -8,7 +8,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.client.config.GuiCheckBox; import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.EffortlessBuilding; -import nl.requios.effortlessbuilding.RadialMirror; +import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; import nl.requios.effortlessbuilding.helper.ReachHelper; import java.io.IOException; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/SettingsGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/SettingsGui.java index ddc379d..2a83890 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/SettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/SettingsGui.java @@ -2,7 +2,11 @@ package nl.requios.effortlessbuilding.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import nl.requios.effortlessbuilding.*; +import nl.requios.effortlessbuilding.BuildSettingsManager; +import nl.requios.effortlessbuilding.EffortlessBuilding; +import nl.requios.effortlessbuilding.buildmodifier.Array; +import nl.requios.effortlessbuilding.buildmodifier.Mirror; +import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; import nl.requios.effortlessbuilding.network.BuildSettingsMessage; import nl.requios.effortlessbuilding.proxy.ClientProxy; diff --git a/src/main/java/nl/requios/effortlessbuilding/helper/RenderHelper.java b/src/main/java/nl/requios/effortlessbuilding/helper/RenderHelper.java index fe216eb..7b24c9d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/helper/RenderHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/helper/RenderHelper.java @@ -13,14 +13,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.IWorldEventListener; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; -import nl.requios.effortlessbuilding.*; +import nl.requios.effortlessbuilding.BuildConfig; +import nl.requios.effortlessbuilding.BuildSettingsManager; +import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers; +import nl.requios.effortlessbuilding.buildmodifier.Mirror; +import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import nl.requios.effortlessbuilding.proxy.ClientProxy; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java index b3b2ad3..9bd7209 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java @@ -40,7 +40,7 @@ public class ItemReachUpgrade1 extends Item { if (currentLevel == 0) { buildSettings.setReachUpgrade(1); - if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to level " + ReachHelper.getMaxReach(player)); + if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player)); player.setHeldItem(hand, ItemStack.EMPTY); SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java index 71d0904..b5d1099 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java @@ -38,7 +38,7 @@ public class ItemReachUpgrade2 extends Item { int currentLevel = buildSettings.getReachUpgrade(); if (currentLevel == 1) { buildSettings.setReachUpgrade(2); - if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to level " + ReachHelper.getMaxReach(player)); + if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player)); player.setHeldItem(hand, ItemStack.EMPTY); SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java index cd2de41..c6693ef 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java @@ -38,7 +38,7 @@ public class ItemReachUpgrade3 extends Item { int currentLevel = buildSettings.getReachUpgrade(); if (currentLevel == 2) { buildSettings.setReachUpgrade(3); - if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to level " + ReachHelper.getMaxReach(player)); + if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player)); player.setHeldItem(hand, ItemStack.EMPTY); SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup")); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java index 2a18cb1..cfbd1d3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java @@ -9,8 +9,8 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; -import nl.requios.effortlessbuilding.BuildModifiers; import nl.requios.effortlessbuilding.EffortlessBuilding; +import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers; public class BlockBrokenMessage implements IMessage { diff --git a/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java index 9567234..be4867b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java @@ -9,8 +9,8 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; -import nl.requios.effortlessbuilding.BuildModifiers; import nl.requios.effortlessbuilding.EffortlessBuilding; +import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers; import nl.requios.effortlessbuilding.proxy.ClientProxy; public class BlockPlacedMessage implements IMessage { diff --git a/src/main/java/nl/requios/effortlessbuilding/network/BuildSettingsMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/BuildSettingsMessage.java index fd18167..cdcc8d0 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/BuildSettingsMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/BuildSettingsMessage.java @@ -8,8 +8,12 @@ import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import nl.requios.effortlessbuilding.*; +import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings; +import nl.requios.effortlessbuilding.EffortlessBuilding; +import nl.requios.effortlessbuilding.buildmodifier.Array; +import nl.requios.effortlessbuilding.buildmodifier.Mirror; +import nl.requios.effortlessbuilding.buildmodifier.RadialMirror; public class BuildSettingsMessage implements IMessage { diff --git a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java index 8811508..2c05e69 100644 --- a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java +++ b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java @@ -34,9 +34,9 @@ import net.minecraftforge.fml.common.gameevent.InputEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.relauncher.Side; -import nl.requios.effortlessbuilding.BuildModifiers; import nl.requios.effortlessbuilding.BuildSettingsManager; import nl.requios.effortlessbuilding.EffortlessBuilding; +import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers; import nl.requios.effortlessbuilding.gui.SettingsGui; import nl.requios.effortlessbuilding.helper.ReachHelper; import nl.requios.effortlessbuilding.helper.RenderHelper;