diff --git a/dependencies.gradle b/dependencies.gradle index 5151f97..4d34b63 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,8 +2,8 @@ dependencies { api('com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev') - api('com.github.GTNewHorizons:ModularUI:1.2.18:dev') - api('com.github.GTNewHorizons:ThaumicBoots:1.4.7:dev') { + api('com.github.GTNewHorizons:ModularUI:1.2.20:dev') + api('com.github.GTNewHorizons:ThaumicBoots:1.4.9:dev') { exclude group: 'com.github.GTNewHorizons', module: 'Electro-Magic-Tools' exclude module: 'Baubles' } @@ -11,5 +11,5 @@ dependencies { api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.349:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.395:dev') } diff --git a/gradle.properties b/gradle.properties index ef511d6..86e604c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -151,7 +151,7 @@ modrinthProjectId = # type can be one of [project, version], # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. modrinthRelations = # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. diff --git a/settings.gradle b/settings.gradle index ff436f2..7622cde 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' } diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 51eab0d..60cc8a6 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -54,7 +54,7 @@ public class ItemElectricBootsTraveller extends ItemArmor this.setMaxDamage(27); this.setMaxStackSize(1); this.setCreativeTab(EMT.TAB); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(new EventHandler()); } @SideOnly(Side.CLIENT) @@ -188,17 +188,6 @@ public class ItemElectricBootsTraveller extends ItemArmor } } - @SubscribeEvent - public void onPlayerJump(LivingEvent.LivingJumpEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack boots = player.getCurrentArmor(0); - boolean hasArmor = boots != null && boots.getItem() == this; - - if (hasArmor) player.motionY += jumpBonus * (float) getJumpModifier(boots); - } - } - // make the boots worth upgrading public float getMaxHealthyDropDist() { return 20.0F; @@ -208,36 +197,6 @@ public class ItemElectricBootsTraveller extends ItemArmor return 4.0f; } - @SubscribeEvent - public void onLivingFall(LivingFallEvent event) { - if ((EMT.instance.isSimulating()) && ((event.entity instanceof EntityLivingBase))) { - if (event.entity instanceof EntityPlayer) { - EntityPlayer entity = (EntityPlayer) event.entity; - if ((entity.inventory.armorInventory[0] != null) - && (entity.inventory.armorInventory[0].getItem() instanceof ItemElectricBootsTraveller)) { - ItemElectricBootsTraveller tUsedBoots = (ItemElectricBootsTraveller) entity.inventory.armorInventory[0] - .getItem(); - ItemStack stack = entity.inventory.armorInventory[0]; - - // Check if we dropped the minimum amount; To cover the jump-boost bonus without penalty - if (tUsedBoots.getMinimumDropDist() > event.distance) { - event.setCanceled(true); - } else { - float tEnergyDemand = tUsedBoots.energyPerDamage - * (((event.distance > tUsedBoots.getMaxHealthyDropDist()) ? event.distance * 3 - : event.distance) - 4.0F); - if (tEnergyDemand <= ElectricItem.manager.getCharge(stack)) { - // EMT.LOGGER.info( String.format("FD: %f DMG: %f EPD: %d HDD: %f", event.distance, - // tEnergyDemand, tUsedBoots.energyPerDamage, tUsedBoots.getMaxHealthyDropDist() )); - ElectricItem.manager.discharge(stack, tEnergyDemand, Integer.MAX_VALUE, true, false, false); - event.setCanceled(true); - } - } - } - } - } - } - @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return EMT.TEXTURE_PATH + ":textures/models/electricboots.png"; @@ -341,4 +300,49 @@ public class ItemElectricBootsTraveller extends ItemArmor return false; } + public class EventHandler { + + @SubscribeEvent + public void onPlayerJump(LivingEvent.LivingJumpEvent event) { + if (event.entityLiving instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) event.entityLiving; + ItemStack boots = player.getCurrentArmor(0); + boolean hasArmor = boots != null && boots.getItem() == ItemElectricBootsTraveller.this; + + if (hasArmor) player.motionY += jumpBonus * (float) getJumpModifier(boots); + } + } + + @SubscribeEvent + public void onLivingFall(LivingFallEvent event) { + if ((EMT.instance.isSimulating()) && ((event.entity instanceof EntityLivingBase))) { + if (event.entity instanceof EntityPlayer) { + EntityPlayer entity = (EntityPlayer) event.entity; + if ((entity.inventory.armorInventory[0] != null) + && (entity.inventory.armorInventory[0].getItem() instanceof ItemElectricBootsTraveller)) { + ItemElectricBootsTraveller tUsedBoots = (ItemElectricBootsTraveller) entity.inventory.armorInventory[0] + .getItem(); + ItemStack stack = entity.inventory.armorInventory[0]; + + // Check if we dropped the minimum amount; To cover the jump-boost bonus without penalty + if (tUsedBoots.getMinimumDropDist() > event.distance) { + event.setCanceled(true); + } else { + float tEnergyDemand = tUsedBoots.energyPerDamage + * (((event.distance > tUsedBoots.getMaxHealthyDropDist()) ? event.distance * 3 + : event.distance) - 4.0F); + if (tEnergyDemand <= ElectricItem.manager.getCharge(stack)) { + // EMT.LOGGER.info( String.format("FD: %f DMG: %f EPD: %d HDD: %f", event.distance, + // tEnergyDemand, tUsedBoots.energyPerDamage, tUsedBoots.getMaxHealthyDropDist() )); + ElectricItem.manager + .discharge(stack, tEnergyDemand, Integer.MAX_VALUE, true, false, false); + event.setCanceled(true); + } + } + } + } + } + } + } + } diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index ee8ca8b..0bc617f 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -60,7 +60,7 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I public ItemInfusedQuantumChestplate(InternalName internalName, int armorType) { super(internalName, InternalName.quantum, armorType, 20000000D, 18000.0D, 4); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(new EventHandler()); this.setCreativeTab(EMT.TAB); } @@ -83,24 +83,6 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I return (StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); } - @SubscribeEvent - public void onEntityLivingFallEvent(LivingFallEvent event) { - if (IC2.platform.isSimulating() && (event.entity instanceof EntityLivingBase)) { - EntityLivingBase entity = (EntityLivingBase) event.entity; - ItemStack armor = entity.getEquipmentInSlot(1); - - if ((armor != null) && (armor.getItem() == this)) { - int fallDamage = Math.max((int) event.distance - 10, 0); - double energyCost = getEnergyPerDamage() * fallDamage; - - if (energyCost <= ElectricItem.manager.getCharge(armor)) { - ElectricItem.manager.discharge(armor, energyCost, Integer.MAX_VALUE, true, false, false); - event.setCanceled(true); - } - } - } - } - @Override public double getDamageAbsorptionRatio() { return 1.1D; @@ -574,4 +556,25 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I public boolean protectsAgainst(ItemStack itemStack, Hazard hazard) { return true; } + + public class EventHandler { + + @SubscribeEvent + public void onEntityLivingFallEvent(LivingFallEvent event) { + if (IC2.platform.isSimulating() && (event.entity instanceof EntityLivingBase)) { + EntityLivingBase entity = (EntityLivingBase) event.entity; + ItemStack armor = entity.getEquipmentInSlot(1); + + if ((armor != null) && (armor.getItem() == ItemInfusedQuantumChestplate.this)) { + int fallDamage = Math.max((int) event.distance - 10, 0); + double energyCost = getEnergyPerDamage() * fallDamage; + + if (energyCost <= ElectricItem.manager.getCharge(armor)) { + ElectricItem.manager.discharge(armor, energyCost, Integer.MAX_VALUE, true, false, false); + event.setCanceled(true); + } + } + } + } + } } diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index e6dc37d..bf6337e 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -34,7 +34,7 @@ import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.api.net.GTPacketBlockEvent; +import gregtech.common.data.GTBlockEventTracker; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -839,11 +839,7 @@ public class TileEntityBaseGenerator extends TileEntityEMT implements IInventory @Override public void sendBlockEvent(byte aID, byte aValue) { - GTValues.NW.sendPacketToAllPlayersInRange( - this.worldObj, - new GTPacketBlockEvent(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue), - this.xCoord, - this.zCoord); + GTBlockEventTracker.enqueue(worldObj, xCoord, yCoord, zCoord, aID, aValue); } @Override diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index aa2aec9..86af6d0 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -34,7 +34,7 @@ import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; -import gregtech.api.net.GTPacketBlockEvent; +import gregtech.common.data.GTBlockEventTracker; import ic2.api.tile.IWrenchable; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.visnet.VisNetHandler; @@ -856,11 +856,7 @@ public class TileEntitySolarBase extends TileEntityEMT implements IInventory, IW @Override public void sendBlockEvent(byte aID, byte aValue) { - GTValues.NW.sendPacketToAllPlayersInRange( - this.worldObj, - new GTPacketBlockEvent(this.xCoord, (short) this.yCoord, this.zCoord, aID, aValue), - this.xCoord, - this.zCoord); + GTBlockEventTracker.enqueue(this.worldObj, this.xCoord, this.yCoord, this.zCoord, aID, aValue); } @Override