diff --git a/dependencies.gradle b/dependencies.gradle index f5f2a877..cf2ca5c2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,6 +11,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev") {transitive = false} compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.312:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:GTNHLib:0.6.25:dev") {transitive = false} compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false} compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false} diff --git a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java index 7c91cd73..91d99180 100644 --- a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java +++ b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java @@ -59,15 +59,6 @@ public class DraconicEvolution { @Mod.EventHandler public static void preInit(final FMLPreInitializationEvent event) { if (debug) LogHelper.info("Initialization"); - - // event.getModMetadata().autogenerated = false; - // event.getModMetadata().credits = ""; - // event.getModMetadata().description = "This is a mod originally made for the Tolkiencraft mod pack"; - // event.getModMetadata().authorList = Arrays.asList("brandon3055"); - // event.getModMetadata().logoFile = "banner.png"; - // event.getModMetadata().url = "http://www.brandon3055.com/"; - // event.getModMetadata().version = References.VERSION + "-MC1.7.10"; - proxy.preInit(event); } @@ -75,20 +66,14 @@ public class DraconicEvolution { public void init(final FMLInitializationEvent event) { if (debug) System.out.println("init()"); proxy.init(event); - - // === - - // === } @Mod.EventHandler public void postInit(final FMLPostInitializationEvent event) { if (debug) System.out.println("postInit()"); - proxy.postInit(event); } - // FMLInterModComms.sendMessage("DraconicEvolution", "addChestRecipe:item.coal", new ItemStack(Items.diamond, 2)); @Mod.EventHandler public void processMessage(FMLInterModComms.IMCEvent event) { for (FMLInterModComms.IMCMessage m : event.getMessages()) { diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java index d76bd8bc..c2b0a0b3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyBindings.java @@ -5,6 +5,7 @@ import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.integration.ModHelper; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.relauncher.Side; @@ -21,6 +22,7 @@ public final class KeyBindings { public static final KeyBinding toolProfileChange; public static final KeyBinding toggleFlight; public static final KeyBinding toggleMagnet; + public static KeyBinding toggleMagnetSelfPickup; static { placeItem = new KeyBinding("key.placeItem", Keyboard.KEY_V, References.MODNAME); @@ -28,6 +30,10 @@ public final class KeyBindings { toolProfileChange = new KeyBinding("key.toolProfileChange", Keyboard.KEY_NONE, References.MODNAME); toggleFlight = new KeyBinding("key.toggleFlight", Keyboard.KEY_NONE, References.MODNAME); toggleMagnet = new KeyBinding("key.toggleMagnet", Keyboard.KEY_NONE, References.MODNAME); + if (ModHelper.isHodgepodgeLoaded) toggleMagnetSelfPickup = new KeyBinding( + "key.toggleMagnetSelfPickup", + Keyboard.KEY_NONE, + References.MODNAME); } private KeyBindings() {} @@ -38,5 +44,6 @@ public final class KeyBindings { ClientRegistry.registerKeyBinding(toolProfileChange); ClientRegistry.registerKeyBinding(toggleFlight); ClientRegistry.registerKeyBinding(toggleMagnet); + if (ModHelper.isHodgepodgeLoaded) ClientRegistry.registerKeyBinding(toggleMagnetSelfPickup); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java index d56633b7..3ab05f39 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/keybinding/KeyInputHandler.java @@ -20,10 +20,12 @@ import com.brandon3055.draconicevolution.common.items.tools.Magnet; import com.brandon3055.draconicevolution.common.items.tools.baseclasses.ToolHandler; import com.brandon3055.draconicevolution.common.network.ButtonPacket; import com.brandon3055.draconicevolution.common.network.MagnetTogglePacket; +import com.brandon3055.draconicevolution.common.network.MagnetToggleSelfPickupPacket; import com.brandon3055.draconicevolution.common.network.PlacedItemPacket; import com.brandon3055.draconicevolution.common.network.TeleporterPacket; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.InventoryUtils; +import com.brandon3055.draconicevolution.integration.ModHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; @@ -50,6 +52,8 @@ public class KeyInputHandler { handleToggleFlightKey(player); } else if (KeyBindings.toggleMagnet.isPressed()) { handleToggleMagnetKey(player); + } else if (ModHelper.isHodgepodgeLoaded && KeyBindings.toggleMagnetSelfPickup.isPressed()) { + handleToggleMagnetSelfPickup(player); } } @@ -68,6 +72,8 @@ public class KeyInputHandler { handleToggleFlightKey(player); } else if (KeyBindings.toggleMagnet.isPressed()) { handleToggleMagnetKey(player); + } else if (ModHelper.isHodgepodgeLoaded && KeyBindings.toggleMagnetSelfPickup.isPressed()) { + handleToggleMagnetSelfPickup(player); } if (player != null) { @@ -139,6 +145,14 @@ public class KeyInputHandler { } } + private void handleToggleMagnetSelfPickup(EntityClientPlayerMP player) { + Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); + + if (magnetOptional.isPresent()) { + DraconicEvolution.network.sendToServer(new MagnetToggleSelfPickupPacket()); + } + } + private int previousSlot(int i, int c) { if (c > 0 && c < 8) return c + i; if (c == 0 && i < 0) return 8; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index 589a153f..042575ab 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -43,6 +43,8 @@ import com.brandon3055.draconicevolution.common.network.GenericParticlePacket; import com.brandon3055.draconicevolution.common.network.ItemConfigPacket; import com.brandon3055.draconicevolution.common.network.MagnetToggleAckPacket; import com.brandon3055.draconicevolution.common.network.MagnetTogglePacket; +import com.brandon3055.draconicevolution.common.network.MagnetToggleSelfPickupAckPacket; +import com.brandon3055.draconicevolution.common.network.MagnetToggleSelfPickupPacket; import com.brandon3055.draconicevolution.common.network.MountUpdatePacket; import com.brandon3055.draconicevolution.common.network.ParticleGenPacket; import com.brandon3055.draconicevolution.common.network.PlacedItemPacket; @@ -154,7 +156,6 @@ public class CommonProxy { PotionHandler.init(); CCOCIntegration.init(); DragonChunkLoader.init(); - LogHelper.info("Finished Initialization"); } @@ -166,121 +167,76 @@ public class CommonProxy { } public void initializeNetwork() { + // spotless:off DraconicEvolution.network = NetworkRegistry.INSTANCE.newSimpleChannel(DraconicEvolution.networkChannelName); DraconicEvolution.network.registerMessage(ButtonPacket.Handler.class, ButtonPacket.class, 0, Side.SERVER); - DraconicEvolution.network - .registerMessage(ParticleGenPacket.Handler.class, ParticleGenPacket.class, 1, Side.SERVER); - DraconicEvolution.network - .registerMessage(PlacedItemPacket.Handler.class, PlacedItemPacket.class, 2, Side.SERVER); - DraconicEvolution.network.registerMessage( - PlayerDetectorButtonPacket.Handler.class, - PlayerDetectorButtonPacket.class, - 3, - Side.SERVER); - DraconicEvolution.network.registerMessage( - PlayerDetectorStringPacket.Handler.class, - PlayerDetectorStringPacket.class, - 4, - Side.SERVER); - DraconicEvolution.network - .registerMessage(TeleporterPacket.Handler.class, TeleporterPacket.class, 5, Side.SERVER); - DraconicEvolution.network - .registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 6, Side.CLIENT); - DraconicEvolution.network - .registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 7, Side.CLIENT); - DraconicEvolution.network - .registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 8, Side.SERVER); - DraconicEvolution.network - .registerMessage(ItemConfigPacket.Handler.class, ItemConfigPacket.class, 9, Side.SERVER); - DraconicEvolution.network - .registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 10, Side.SERVER); - DraconicEvolution.network - .registerMessage(BlockUpdatePacket.Handler.class, BlockUpdatePacket.class, 11, Side.SERVER); - DraconicEvolution.network - .registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 12, Side.SERVER); - DraconicEvolution.network - .registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 13, Side.CLIENT); + DraconicEvolution.network.registerMessage(ParticleGenPacket.Handler.class, ParticleGenPacket.class, 1, Side.SERVER); + DraconicEvolution.network.registerMessage(PlacedItemPacket.Handler.class, PlacedItemPacket.class, 2, Side.SERVER); + DraconicEvolution.network.registerMessage(PlayerDetectorButtonPacket.Handler.class, PlayerDetectorButtonPacket.class, 3, Side.SERVER); + DraconicEvolution.network.registerMessage(PlayerDetectorStringPacket.Handler.class, PlayerDetectorStringPacket.class, 4, Side.SERVER); + DraconicEvolution.network.registerMessage(TeleporterPacket.Handler.class, TeleporterPacket.class, 5, Side.SERVER); + DraconicEvolution.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 6, Side.CLIENT); + DraconicEvolution.network.registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 7, Side.CLIENT); + DraconicEvolution.network.registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 8, Side.SERVER); + DraconicEvolution.network.registerMessage(ItemConfigPacket.Handler.class, ItemConfigPacket.class, 9, Side.SERVER); + DraconicEvolution.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 10, Side.SERVER); + DraconicEvolution.network.registerMessage(BlockUpdatePacket.Handler.class, BlockUpdatePacket.class, 11, Side.SERVER); + DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 12, Side.SERVER); + DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 13, Side.CLIENT); DraconicEvolution.network.registerMessage(ToolModePacket.Handler.class, ToolModePacket.class, 14, Side.SERVER); - DraconicEvolution.network - .registerMessage(GenericParticlePacket.Handler.class, GenericParticlePacket.class, 15, Side.CLIENT); - DraconicEvolution.network - .registerMessage(ShieldHitPacket.Handler.class, ShieldHitPacket.class, 16, Side.CLIENT); - DraconicEvolution.network - .registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 17, Side.CLIENT); - DraconicEvolution.network - .registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 18, Side.SERVER); - DraconicEvolution.network - .registerMessage(MagnetTogglePacket.Handler.class, MagnetTogglePacket.class, 19, Side.SERVER); - DraconicEvolution.network - .registerMessage(MagnetToggleAckPacket.Handler.class, MagnetToggleAckPacket.class, 20, Side.CLIENT); - DraconicEvolution.network.registerMessage( - DislocatorInhibitorButtonPacket.Handler.class, - DislocatorInhibitorButtonPacket.class, - 21, - Side.SERVER); - DraconicEvolution.network - .registerMessage(SlotFakeClickPacket.Handler.class, SlotFakeClickPacket.class, 22, Side.SERVER); + DraconicEvolution.network.registerMessage(GenericParticlePacket.Handler.class, GenericParticlePacket.class, 15, Side.CLIENT); + DraconicEvolution.network.registerMessage(ShieldHitPacket.Handler.class, ShieldHitPacket.class, 16, Side.CLIENT); + DraconicEvolution.network.registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 17, Side.CLIENT); + DraconicEvolution.network.registerMessage(ContributorPacket.Handler.class, ContributorPacket.class, 18, Side.SERVER); + DraconicEvolution.network.registerMessage(MagnetTogglePacket.Handler.class, MagnetTogglePacket.class, 19, Side.SERVER); + DraconicEvolution.network.registerMessage(MagnetToggleAckPacket.Handler.class, MagnetToggleAckPacket.class, 20, Side.CLIENT); + DraconicEvolution.network.registerMessage(DislocatorInhibitorButtonPacket.Handler.class, DislocatorInhibitorButtonPacket.class, 21, Side.SERVER); + DraconicEvolution.network.registerMessage(SlotFakeClickPacket.Handler.class, SlotFakeClickPacket.class, 22, Side.SERVER); + DraconicEvolution.network.registerMessage(MagnetToggleSelfPickupPacket.Handler.class, MagnetToggleSelfPickupPacket.class, 23, Side.SERVER); + DraconicEvolution.network.registerMessage(MagnetToggleSelfPickupAckPacket.Handler.class, MagnetToggleSelfPickupAckPacket.class, 24, Side.CLIENT); + // spotless:on } public void registerTileEntities() { - GameRegistry - .registerTileEntity(TileWeatherController.class, References.RESOURCESPREFIX + "TileWeatherController"); + // spotless:off + GameRegistry.registerTileEntity(TileWeatherController.class, References.RESOURCESPREFIX + "TileWeatherController"); GameRegistry.registerTileEntity(TileSunDial.class, References.RESOURCESPREFIX + "TileSunDial"); GameRegistry.registerTileEntity(TileGrinder.class, References.RESOURCESPREFIX + "TileGrinder"); GameRegistry.registerTileEntity(TilePotentiometer.class, References.RESOURCESPREFIX + "TilePotentiometer"); - GameRegistry - .registerTileEntity(TileParticleGenerator.class, References.RESOURCESPREFIX + "TileParticleGenerator"); + GameRegistry.registerTileEntity(TileParticleGenerator.class, References.RESOURCESPREFIX + "TileParticleGenerator"); GameRegistry.registerTileEntity(TilePlayerDetector.class, References.RESOURCESPREFIX + "TilePlayerDetector"); - GameRegistry.registerTileEntity( - TilePlayerDetectorAdvanced.class, - References.RESOURCESPREFIX + "TilePlayerDetectorAdvanced"); + GameRegistry.registerTileEntity(TilePlayerDetectorAdvanced.class, References.RESOURCESPREFIX + "TilePlayerDetectorAdvanced"); GameRegistry.registerTileEntity(TileEnergyInfuser.class, References.RESOURCESPREFIX + "TileEnergyInfuser"); GameRegistry.registerTileEntity(TileCustomSpawner.class, References.RESOURCESPREFIX + "TileCustomSpawner"); GameRegistry.registerTileEntity(TileGenerator.class, References.RESOURCESPREFIX + "TileGenerator"); - GameRegistry - .registerTileEntity(TileEnergyStorageCore.class, References.RESOURCESPREFIX + "TileEnergyStorageCore"); + GameRegistry.registerTileEntity(TileEnergyStorageCore.class, References.RESOURCESPREFIX + "TileEnergyStorageCore"); GameRegistry.registerTileEntity(TileEarth.class, References.RESOURCESPREFIX + "TileEarth"); - GameRegistry.registerTileEntity( - TileInvisibleMultiblock.class, - References.RESOURCESPREFIX + "TileInvisibleMultiblock"); + GameRegistry.registerTileEntity(TileInvisibleMultiblock.class, References.RESOURCESPREFIX + "TileInvisibleMultiblock"); GameRegistry.registerTileEntity(TileEnergyPylon.class, References.RESOURCESPREFIX + "TileEnergyPylon"); - GameRegistry - .registerTileEntity(TileEnderResurrection.class, References.RESOURCESPREFIX + "TileEnderResurrection"); + GameRegistry.registerTileEntity(TileEnderResurrection.class, References.RESOURCESPREFIX + "TileEnderResurrection"); GameRegistry.registerTileEntity(TilePlacedItem.class, References.RESOURCESPREFIX + "TilePlacedItem"); GameRegistry.registerTileEntity(TileCKeyStone.class, References.RESOURCESPREFIX + "TileCKeyStone"); GameRegistry.registerTileEntity(TileDissEnchanter.class, References.RESOURCESPREFIX + "TileDissEnchanter"); GameRegistry.registerTileEntity(TileTeleporterStand.class, References.RESOURCESPREFIX + "TileTeleporterStand"); GameRegistry.registerTileEntity(TileDraconiumChest.class, References.RESOURCESPREFIX + "TileDraconiumChest"); GameRegistry.registerTileEntity(TileEnergyRelay.class, References.RESOURCESPREFIX + "TileEnergyRelay"); - GameRegistry - .registerTileEntity(TileEnergyTransceiver.class, References.RESOURCESPREFIX + "TileEnergyTransceiver"); - GameRegistry.registerTileEntity( - TileWirelessEnergyTransceiver.class, - References.RESOURCESPREFIX + "TileWirelessEnergyTransceiver"); - GameRegistry.registerTileEntity( - TileDislocatorReceptacle.class, - References.RESOURCESPREFIX + "TileDislocatorReceptacle"); + GameRegistry.registerTileEntity(TileEnergyTransceiver.class, References.RESOURCESPREFIX + "TileEnergyTransceiver"); + GameRegistry.registerTileEntity(TileWirelessEnergyTransceiver.class, References.RESOURCESPREFIX + "TileWirelessEnergyTransceiver"); + GameRegistry.registerTileEntity(TileDislocatorReceptacle.class, References.RESOURCESPREFIX + "TileDislocatorReceptacle"); GameRegistry.registerTileEntity(TilePortalBlock.class, References.RESOURCESPREFIX + "TilePortalBlock"); GameRegistry.registerTileEntity(TileReactorCore.class, References.RESOURCESPREFIX + "TileReactorCore"); GameRegistry.registerTileEntity(TileFluxGate.class, References.RESOURCESPREFIX + "TileFluxGate"); GameRegistry.registerTileEntity(TileFluidGate.class, References.RESOURCESPREFIX + "TileFluidGate"); - GameRegistry - .registerTileEntity(TileReactorStabilizer.class, References.RESOURCESPREFIX + "TileReactorStabilizer"); - GameRegistry.registerTileEntity( - TileReactorEnergyInjector.class, - References.RESOURCESPREFIX + "TileReactorEnergyInjector"); + GameRegistry.registerTileEntity(TileReactorStabilizer.class, References.RESOURCESPREFIX + "TileReactorStabilizer"); + GameRegistry.registerTileEntity(TileReactorEnergyInjector.class, References.RESOURCESPREFIX + "TileReactorEnergyInjector"); GameRegistry.registerTileEntity(TileChaosShard.class, References.RESOURCESPREFIX + "TileChaosShard"); - GameRegistry - .registerTileEntity(TileUpgradeModifier.class, References.RESOURCESPREFIX + "TileEnhancementModifier"); - GameRegistry.registerTileEntity( - TileDislocatorInhibitor.class, - References.RESOURCESPREFIX + "TileDislocatorInhibitor"); + GameRegistry.registerTileEntity(TileUpgradeModifier.class, References.RESOURCESPREFIX + "TileEnhancementModifier"); + GameRegistry.registerTileEntity(TileDislocatorInhibitor.class, References.RESOURCESPREFIX + "TileDislocatorInhibitor"); if (DraconicEvolution.debug) { GameRegistry.registerTileEntity(TileTestBlock.class, References.RESOURCESPREFIX + "TileTestBlock"); - GameRegistry.registerTileEntity( - TileContainerTemplate.class, - References.RESOURCESPREFIX + "TileContainerTemplate"); + GameRegistry.registerTileEntity(TileContainerTemplate.class, References.RESOURCESPREFIX + "TileContainerTemplate"); } + // spotless:on } public void registerEventListeners(Side s) { @@ -320,78 +276,20 @@ public class CommonProxy { // @Callback public void registerEntities() { - EntityRegistry.registerModEntity( - EntityCustomDragon.class, - "EnderDragon", - 0, - DraconicEvolution.instance, - 256, - 3, - true); - EntityRegistry.registerModEntity( - EntityPersistentItem.class, - "Persistent Item", - 1, - DraconicEvolution.instance, - 32, - 5, - true); - EntityRegistry - .registerModEntity(EntityDraconicArrow.class, "Arrow", 2, DraconicEvolution.instance, 32, 5, true); - EntityRegistry - .registerModEntity(EntityEnderArrow.class, "Ender Arrow", 3, DraconicEvolution.instance, 32, 1, true); - // EntityRegistry.registerModEntity(EntityChaosDrill.class, "Chaos Drill", 4, DraconicEvolution.instance, 10, 5, - // false); - EntityRegistry.registerModEntity( - EntityDragonHeart.class, - "Dragon Heart Item", - 5, - DraconicEvolution.instance, - 32, - 5, - true); - EntityRegistry.registerModEntity( - EntityChaosGuardian.class, - "ChaosGuardian", - 6, - DraconicEvolution.instance, - 256, - 1, - true); - EntityRegistry.registerModEntity( - EntityDragonProjectile.class, - "DragonProjectile", - 7, - DraconicEvolution.instance, - 256, - 1, - true); - EntityRegistry.registerModEntity( - EntityChaosCrystal.class, - "ChaosCrystal", - 8, - DraconicEvolution.instance, - 256, - 5, - false); - EntityRegistry - .registerModEntity(EntityChaosBolt.class, "ChaosBolt", 9, DraconicEvolution.instance, 32, 5, true); - EntityRegistry.registerModEntity( - EntityChaosVortex.class, - "EntityChaosEnergyVortex", - 10, - DraconicEvolution.instance, - 512, - 5, - true); - EntityRegistry.registerModEntity( - EntityCustomArrow.class, - "CustomArrow", - 11, - DraconicEvolution.instance, - 128, - 1, - true); + // spotless:off + EntityRegistry.registerModEntity(EntityCustomDragon.class, "EnderDragon", 0, DraconicEvolution.instance, 256, 3, true); + EntityRegistry.registerModEntity(EntityPersistentItem.class, "Persistent Item", 1, DraconicEvolution.instance, 32, 5, true); + EntityRegistry.registerModEntity(EntityDraconicArrow.class, "Arrow", 2, DraconicEvolution.instance, 32, 5, true); + EntityRegistry.registerModEntity(EntityEnderArrow.class, "Ender Arrow", 3, DraconicEvolution.instance, 32, 1, true); + // EntityRegistry.registerModEntity(EntityChaosDrill.class, "Chaos Drill", 4, DraconicEvolution.instance, 10, 5, false); + EntityRegistry.registerModEntity(EntityDragonHeart.class, "Dragon Heart Item", 5, DraconicEvolution.instance, 32, 5, true); + EntityRegistry.registerModEntity(EntityChaosGuardian.class, "ChaosGuardian", 6, DraconicEvolution.instance, 256, 1, true); + EntityRegistry.registerModEntity(EntityDragonProjectile.class, "DragonProjectile", 7, DraconicEvolution.instance, 256, 1, true); + EntityRegistry.registerModEntity(EntityChaosCrystal.class, "ChaosCrystal", 8, DraconicEvolution.instance, 256, 5, false); + EntityRegistry.registerModEntity(EntityChaosBolt.class, "ChaosBolt", 9, DraconicEvolution.instance, 32, 5, true); + EntityRegistry.registerModEntity(EntityChaosVortex.class, "EntityChaosEnergyVortex", 10, DraconicEvolution.instance, 512, 5, true); + EntityRegistry.registerModEntity(EntityCustomArrow.class, "CustomArrow", 11, DraconicEvolution.instance, 128, 1, true); + // spotless:on } public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java index b6f5238c..f0cff832 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Magnet.java @@ -3,6 +3,8 @@ package com.brandon3055.draconicevolution.common.items.tools; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -14,6 +16,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -29,8 +32,10 @@ import com.brandon3055.draconicevolution.common.items.ItemDE; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; +import com.brandon3055.draconicevolution.common.utills.InventoryUtils; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; import com.brandon3055.draconicevolution.integration.ModHelper; +import com.gtnewhorizon.gtnhlib.GTNHLib; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -48,6 +53,20 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { private IIcon draconium; private IIcon awakened; + private enum SelfPickUpMode { + + // enum order matters, + // do not re-order + ALWAYS, + DELAY, + NEVER; + + public SelfPickUpMode next() { + final SelfPickUpMode[] values = SelfPickUpMode.values(); + return values[(this.ordinal() + 1) % values.length]; + } + } + public Magnet() { this.setUnlocalizedName("magnet"); this.setCreativeTab(DraconicEvolution.tabBlocksItems); @@ -93,18 +112,77 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { // if changes are ever made, they should be made on both @Override public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean hotbar) { - if (entity.ticksExisted % 5 != 0 || !isEnabled(stack)) { + if (entity.ticksExisted % 5 != 0 || !(entity instanceof EntityPlayer player) || !isEnabled(stack)) { return; } if (IConfigurableItem.ProfileHelper.getBoolean(stack, References.MAGNET_SNEAK, true) && entity.isSneaking()) { return; } - if (entity instanceof EntityPlayer player) { - int range = stack.getItemDamage() == 0 ? 8 : 32; + int range = stack.getItemDamage() == 0 ? 8 : 32; + List items = world.getEntitiesWithinAABB( + EntityItem.class, + AxisAlignedBB + .getBoundingBox(player.posX, player.posY, player.posZ, player.posX, player.posY, player.posZ) + .expand(range, range, range)); - List items = world.getEntitiesWithinAABB( - EntityItem.class, + // account for the server/client desync + final double playerEyesPos = player.posY + + (world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight()); + final boolean skipPlayerCheck = world.playerEntities.size() < 2; + final SelfPickUpMode selfPickupStatus = getSelfPickupStatus(stack); + boolean playSound = false; + + for (EntityItem item : items) { + if (item.getEntityItem() == null || ModHelper.isAE2EntityFloatingItem(item) + || TileDislocatorInhibitor.isBlockedByInhibitor(world, item)) { + continue; + } + + String name = Item.itemRegistry.getNameForObject(item.getEntityItem().getItem()); + if (ConfigHandler.itemDislocatorBlacklistMap.containsKey(name) + && (ConfigHandler.itemDislocatorBlacklistMap.get(name) == -1 + || ConfigHandler.itemDislocatorBlacklistMap.get(name) + == item.getEntityItem().getItemDamage())) { + continue; + } + + if (!skipPlayerCheck) { + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(item, range); + if (closestPlayer == null || closestPlayer != player) continue; + } + + boolean doMove = true; + if (ModHelper.isHodgepodgeLoaded && selfPickupStatus != SelfPickUpMode.ALWAYS) { + boolean isOwnDrop = item.func_145800_j() != null + && item.func_145800_j().equals(player.getCommandSenderName()); + doMove = !isOwnDrop || selfPickupStatus == SelfPickUpMode.DELAY && item.delayBeforeCanPickup <= 0; + } + + if (doMove) { + playSound = true; + item.delayBeforeCanPickup = 0; + item.motionX = 0; + item.motionY = 0; + item.motionZ = 0; + item.setPosition( + player.posX - 0.2 + (world.rand.nextDouble() * 0.4), + playerEyesPos - 0.62, // 1 block above feet / "belt height" + player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); + } + } + + if (playSound && !ConfigHandler.itemDislocatorDisableSound) { + world.playSoundAtEntity( + player, + "random.orb", + 0.1F, + 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F)); + } + + if (!world.isRemote) { + List xp = world.getEntitiesWithinAABB( + EntityXPOrb.class, AxisAlignedBB.getBoundingBox( player.posX, player.posY, @@ -112,79 +190,21 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { player.posX, player.posY, player.posZ).expand(range, range, range)); - - final boolean skipPlayerCheck = world.playerEntities.size() < 2; - boolean playSound = false; - // account for the server/client desync - double playerEyesPos = player.posY - + (world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight()); - - for (EntityItem item : items) { - if (item.getEntityItem() == null || ModHelper.isAE2EntityFloatingItem(item) - || TileDislocatorInhibitor.isBlockedByInhibitor(world, item)) { - continue; - } - - String name = Item.itemRegistry.getNameForObject(item.getEntityItem().getItem()); - if (ConfigHandler.itemDislocatorBlacklistMap.containsKey(name) - && (ConfigHandler.itemDislocatorBlacklistMap.get(name) == -1 - || ConfigHandler.itemDislocatorBlacklistMap.get(name) - == item.getEntityItem().getItemDamage())) { - continue; - } - - if (!skipPlayerCheck) { - EntityPlayer closestPlayer = world.getClosestPlayerToEntity(item, range); - if (closestPlayer == null || closestPlayer != player) continue; - } - - playSound = true; - - if (item.delayBeforeCanPickup > 0) { - item.delayBeforeCanPickup = 0; - } - item.motionX = 0; - item.motionY = 0; - item.motionZ = 0; - item.setPosition( - player.posX - 0.2 + (world.rand.nextDouble() * 0.4), - playerEyesPos - 0.62, - player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); - } - if (playSound && !ConfigHandler.itemDislocatorDisableSound) { - world.playSoundAtEntity( - player, - "random.orb", - 0.1F, - 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F)); - } - - if (!world.isRemote) { - List xp = world.getEntitiesWithinAABB( - EntityXPOrb.class, - AxisAlignedBB.getBoundingBox( - player.posX, - player.posY, - player.posZ, - player.posX, - player.posY, - player.posZ).expand(range, range, range)); - for (EntityXPOrb orb : xp) { - if (orb.field_70532_c == 0 && orb.isEntityAlive()) { - if (!skipPlayerCheck) { - EntityPlayer closestPlayer = world.getClosestPlayerToEntity(orb, range); - if (closestPlayer == null || closestPlayer != player) continue; - } - if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, orb))) continue; - world.playSoundAtEntity( - player, - "random.orb", - 0.1F, - 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); - player.onItemPickup(orb, 1); - player.addExperience(orb.xpValue); - orb.setDead(); + for (EntityXPOrb orb : xp) { + if (orb.field_70532_c == 0 && orb.isEntityAlive()) { + if (!skipPlayerCheck) { + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(orb, range); + if (closestPlayer == null || closestPlayer != player) continue; } + if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, orb))) continue; + world.playSoundAtEntity( + player, + "random.orb", + 0.1F, + 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); + player.onItemPickup(orb, 1); + player.addExperience(orb.xpValue); + orb.setDead(); } } } @@ -203,7 +223,7 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { } public static void toggle(ItemStack itemStack) { - final boolean enabled = IConfigurableItem.ProfileHelper.getBoolean(itemStack, References.ENABLED, false); + final boolean enabled = isEnabled(itemStack); IConfigurableItem.ProfileHelper.setBoolean(itemStack, References.ENABLED, !enabled); } @@ -211,6 +231,48 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { IConfigurableItem.ProfileHelper.setBoolean(itemStack, References.ENABLED, status); } + public static String getStatusString(ItemStack itemStack) { + String status; + if (isEnabled(itemStack)) { + status = EnumChatFormatting.DARK_GREEN + StatCollector.translateToLocal("info.de.statusActive.txt"); + } else { + status = EnumChatFormatting.RED + StatCollector.translateToLocal("info.de.statusInactive.txt"); + } + return StatCollector.translateToLocal("info.de.status.txt") + ": " + status; + } + + public static short getSelfPickupStatusShort(ItemStack itemStack) { + return ProfileHelper.getShort(itemStack, References.ENABLED_SELF_PICKUP, (short) 0); + } + + private static SelfPickUpMode getSelfPickupStatus(ItemStack itemStack) { + final short mode = getSelfPickupStatusShort(itemStack); + return SelfPickUpMode.values()[mode]; + } + + public static void toggleSelfPickupStatus(ItemStack itemStack) { + final SelfPickUpMode mode = getSelfPickupStatus(itemStack); + IConfigurableItem.ProfileHelper + .setShort(itemStack, References.ENABLED_SELF_PICKUP, (short) mode.next().ordinal()); + } + + public static void setSelfPickupStatus(ItemStack itemStack, short status) { + IConfigurableItem.ProfileHelper.setShort(itemStack, References.ENABLED_SELF_PICKUP, status); + } + + public static String getSelfPickupStatusString(ItemStack itemStack) { + String status; + switch (getSelfPickupStatus(itemStack)) { + case DELAY -> status = EnumChatFormatting.YELLOW + + StatCollector.translateToLocal("info.de.selfPickupDelay.txt"); + case NEVER -> status = EnumChatFormatting.RED + + StatCollector.translateToLocal("info.de.selfPickupNever.txt"); + default -> status = EnumChatFormatting.DARK_GREEN + + StatCollector.translateToLocal("info.de.selfPickupAlways.txt"); + } + return StatCollector.translateToLocal("info.de.selfPickup.txt") + ": " + status; + } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if (player.isSneaking()) { @@ -228,6 +290,31 @@ public class Magnet extends ItemDE implements IBauble, IConfigurableItem { + InfoHelper.ITC() + " " + StatCollector.translateToLocal("info.de.blockRange.txt")); + list.add(getStatusString(stack)); + if (ModHelper.isHodgepodgeLoaded) list.add(getSelfPickupStatusString(stack)); + } + + @Optional.Method(modid = "gtnhlib") + @SideOnly(Side.CLIENT) + public static void renderHUDStatusChange() { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + java.util.Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); + magnetOptional.ifPresent( + itemStack -> GTNHLib.proxy + .printMessageAboveHotbar(EnumChatFormatting.GOLD + getStatusString(itemStack), 60, true, true)); + } + + @Optional.Method(modid = "gtnhlib") + @SideOnly(Side.CLIENT) + public static void renderHUDSelfPickupStatusChange() { + EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; + java.util.Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); + magnetOptional.ifPresent( + itemStack -> GTNHLib.proxy.printMessageAboveHotbar( + EnumChatFormatting.GOLD + getSelfPickupStatusString(itemStack), + 60, + true, + true)); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java index 0231a66e..06cfad78 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -39,4 +39,5 @@ public final class References { public static final String BASE_SAFE_AOE = "BaseSafeAOE"; public static final String ENABLED = "Enabled"; public static final String MAGNET_SNEAK = "MagnetSneak"; + public static final String ENABLED_SELF_PICKUP = "EnabledSelfPickup"; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleAckPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleAckPacket.java index 6ba93db1..9345c10d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleAckPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleAckPacket.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; import com.brandon3055.draconicevolution.common.items.tools.Magnet; import com.brandon3055.draconicevolution.common.utills.InventoryUtils; +import com.brandon3055.draconicevolution.integration.ModHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -49,6 +50,7 @@ public final class MagnetToggleAckPacket implements IMessage { ItemStack itemStack = magnetOptional.get(); Magnet.setStatus(itemStack, message.status); ClientEventHandler.statusDisplayManager.startDrawing(itemStack.copy()); + if (ModHelper.isGTNHLibLoaded) Magnet.renderHUDStatusChange(); } return null; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleSelfPickupAckPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleSelfPickupAckPacket.java new file mode 100644 index 00000000..bd535da0 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleSelfPickupAckPacket.java @@ -0,0 +1,59 @@ +package com.brandon3055.draconicevolution.common.network; + +import java.util.Optional; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; +import com.brandon3055.draconicevolution.common.items.tools.Magnet; +import com.brandon3055.draconicevolution.common.utills.InventoryUtils; +import com.brandon3055.draconicevolution.integration.ModHelper; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; + +public final class MagnetToggleSelfPickupAckPacket implements IMessage { + + private short status; + + public MagnetToggleSelfPickupAckPacket() {} + + public MagnetToggleSelfPickupAckPacket(short status) { + this.status = status; + } + + @Override + public void fromBytes(ByteBuf buf) { + this.status = buf.readShort(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeShort(this.status); + } + + public static final class Handler implements IMessageHandler { + + @SideOnly(Side.CLIENT) + @Override + public IMessage onMessage(MagnetToggleSelfPickupAckPacket message, MessageContext ctx) { + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); + + if (magnetOptional.isPresent()) { + ItemStack itemStack = magnetOptional.get(); + Magnet.setSelfPickupStatus(itemStack, message.status); + ClientEventHandler.statusDisplayManager.startDrawing(itemStack.copy()); + if (ModHelper.isGTNHLibLoaded) Magnet.renderHUDSelfPickupStatusChange(); + } + + return null; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleSelfPickupPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleSelfPickupPacket.java new file mode 100644 index 00000000..06463f1a --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/MagnetToggleSelfPickupPacket.java @@ -0,0 +1,48 @@ +package com.brandon3055.draconicevolution.common.network; + +import java.util.Optional; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; + +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.common.items.tools.Magnet; +import com.brandon3055.draconicevolution.common.utills.InventoryUtils; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + +public final class MagnetToggleSelfPickupPacket implements IMessage { + + public MagnetToggleSelfPickupPacket() {} + + @Override + public void fromBytes(ByteBuf buf) { + // do nothing + } + + @Override + public void toBytes(ByteBuf buf) { + // do nothing + } + + public static final class Handler implements IMessageHandler { + + @Override + public IMessage onMessage(MagnetToggleSelfPickupPacket message, MessageContext ctx) { + EntityPlayerMP player = ctx.getServerHandler().playerEntity; + + Optional magnetOptional = InventoryUtils.getItemInAnyPlayerInventory(player, Magnet.class); + magnetOptional.ifPresent(itemStack -> { + Magnet.toggleSelfPickupStatus(itemStack); + DraconicEvolution.network.sendTo( + new MagnetToggleSelfPickupAckPacket(Magnet.getSelfPickupStatusShort(itemStack)), + player); + }); + + return null; + } + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java index e6688920..b927c209 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/IConfigurableItem.java @@ -36,6 +36,10 @@ public interface IConfigurableItem { getProfileCompound(stack).setBoolean(tag, b); } + public static void setShort(ItemStack stack, String tag, short s) { + getProfileCompound(stack).setShort(tag, s); + } + public static void setInteger(ItemStack stack, String tag, int i) { getProfileCompound(stack).setInteger(tag, i); } @@ -56,6 +60,10 @@ public interface IConfigurableItem { return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getBoolean(tag) : defaultExpected; } + public static short getShort(ItemStack stack, String tag, short defaultExpected) { + return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getShort(tag) : defaultExpected; + } + public static int getInteger(ItemStack stack, String tag, int defaultExpected) { return getProfileCompound(stack).hasKey(tag) ? getProfileCompound(stack).getInteger(tag) : defaultExpected; } diff --git a/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java b/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java index 48cdeac2..c2eabc4d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java +++ b/src/main/java/com/brandon3055/draconicevolution/integration/ModHelper.java @@ -21,14 +21,15 @@ public class ModHelper { private static final boolean isTConInstalled; private static final boolean isAvaritiaInstalled; - // private static boolean isRotaryCraftInstalled; private static final boolean isGregTechInstalled; private static final boolean isBartworkdsInstalled; private static final boolean isAE2Installed; + public static boolean isGTNHLibLoaded; + public static boolean isHodgepodgeLoaded; + private static Item cleaver; private static Item avaritiaSword; - // private static Item bedrockSword; private static Class bwores; private static Class GTores; @@ -37,10 +38,12 @@ public class ModHelper { static { isTConInstalled = Loader.isModLoaded("TConstruct"); isAvaritiaInstalled = Loader.isModLoaded("Avaritia"); - // isRotaryCraftInstalled = Loader.isModLoaded("RotaryCraft"); isGregTechInstalled = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi"); isBartworkdsInstalled = Loader.isModLoaded("bartworks"); isAE2Installed = Loader.isModLoaded("appliedenergistics2"); + isGTNHLibLoaded = Loader.isModLoaded("gtnhlib"); + isHodgepodgeLoaded = Loader.isModLoaded("hodgepodge"); + final String GT_ORE_CLASS = "gregtech.common.blocks.TileEntityOres"; final String BW_ORE_CLASS = "bartworks.system.material.BWMetaGeneratedOres"; final String AE2_FITEM_CLASS = "appeng.entity.EntityFloatingItem"; @@ -76,15 +79,6 @@ public class ModHelper { && player.getHeldItem().getItem().equals(avaritiaSword); } - // public static boolean isHoldingBedrockSword(EntityPlayer player) { - // if (!isRotaryCraftInstalled) return false; - // else if (bedrockSword == null) bedrockSword = GameRegistry.findItem("RotaryCraft", - // "rotarycraft_item_bedsword"); - // - // return bedrockSword != null && player.getHeldItem() != null && - // player.getHeldItem().getItem().equals(bedrockSword); - // } - public static float applyModDamageAdjustments(ArmorSummery summery, LivingAttackEvent event) { if (summery == null) return event.ammount; EntityPlayer attacker = event.source.getEntity() instanceof EntityPlayer @@ -98,17 +92,7 @@ public class ModHelper { if (isHoldingAvaritiaSword(attacker)) { event.entityLiving.hurtResistantTime = 0; return 300F; - } - // else if (isHoldingBedrockSword(attacker)) { - // summery.entropy += 10; - // - // if (summery.entropy > 100) { - // summery.entropy = 100; - // } - // - // return Math.max(event.ammount, Math.min(50F, summery.protectionPoints)); - // } - else if (event.source.isUnblockable() || event.source.canHarmInCreative()) { + } else if (event.source.isUnblockable() || event.source.canHarmInCreative()) { summery.entropy += 3; if (summery.entropy > 100) { diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 60d946a5..57da9b64 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -292,6 +292,13 @@ info.de.manual.contributorsButton.txt=Contributors info.de.manual.contributorsButtonInfo.txt=A list of people who have contributed to Draconic Evolution info.de.shiftRightClickToActivate.txt=Shift-Right click to activate. info.de.blockRange.txt=Block Range. +info.de.status.txt=Status +info.de.statusActive.txt=Active +info.de.statusInactive.txt=Inactive +info.de.selfPickup.txt=Pick Up Own Drops +info.de.selfPickupAlways.txt=Always +info.de.selfPickupDelay.txt=Delayed +info.de.selfPickupNever.txt=Never info.de.manual.nav1.txt=Navigation Tips info.de.manual.nav2.txt=Press Backspace to go to the previous page. @@ -447,6 +454,7 @@ key.toolConfig=Tool & Armor Config GUI key.toolProfileChange=Change Tool Config Profile key.toggleFlight=Toggle Creative Flight key.toggleMagnet=Toggle Magnet +key.toggleMagnetSelfPickup=Toggle Magnet Self Pick Up //Damage ---------------------------------------------------------------------------------------------------------------------------------------- death.attack.chaos=%1$s was torn apart by a Chaos Guardian