From eef035186ada3aa22e08ce261d049ade2c64d4ac Mon Sep 17 00:00:00 2001 From: Bob Date: Fri, 7 Apr 2023 18:17:03 +0200 Subject: [PATCH] fixes --- src/main/java/com/hbm/blocks/network/CraneBoxer.java | 3 +-- .../java/com/hbm/blocks/network/CraneUnboxer.java | 11 +++++++++++ .../java/com/hbm/inventory/SlotCraftingOutput.java | 2 +- src/main/java/com/hbm/main/ModEventHandler.java | 12 +++++++++++- .../tileentity/machine/TileEntityMachineMixer.java | 4 ++-- src/main/resources/assets/hbm/lang/en_US.lang | 4 ++-- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hbm/blocks/network/CraneBoxer.java b/src/main/java/com/hbm/blocks/network/CraneBoxer.java index c9cd865bc..b884bd62f 100644 --- a/src/main/java/com/hbm/blocks/network/CraneBoxer.java +++ b/src/main/java/com/hbm/blocks/network/CraneBoxer.java @@ -2,7 +2,6 @@ package com.hbm.blocks.network; import com.hbm.lib.RefStrings; import com.hbm.tileentity.network.TileEntityCraneBoxer; -import com.hbm.tileentity.network.TileEntityCraneInserter; import api.hbm.conveyor.IConveyorItem; import api.hbm.conveyor.IConveyorPackage; @@ -81,7 +80,7 @@ public class CraneBoxer extends BlockCraneBase implements IEnterableBlock { @Override public int getComparatorInputOverride(World world, int x, int y, int z, int side) { - return Container.calcRedstoneFromInventory((TileEntityCraneInserter)world.getTileEntity(x, y, z)); + return Container.calcRedstoneFromInventory((TileEntityCraneBoxer)world.getTileEntity(x, y, z)); } @Override diff --git a/src/main/java/com/hbm/blocks/network/CraneUnboxer.java b/src/main/java/com/hbm/blocks/network/CraneUnboxer.java index 530a4b248..558de5654 100644 --- a/src/main/java/com/hbm/blocks/network/CraneUnboxer.java +++ b/src/main/java/com/hbm/blocks/network/CraneUnboxer.java @@ -12,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; +import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; @@ -86,4 +87,14 @@ public class CraneUnboxer extends BlockCraneBase implements IEnterableBlock { } } } + + @Override + public boolean hasComparatorInputOverride() { + return true; + } + + @Override + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + return Container.calcRedstoneFromInventory((TileEntityCraneUnboxer)world.getTileEntity(x, y, z)); + } } diff --git a/src/main/java/com/hbm/inventory/SlotCraftingOutput.java b/src/main/java/com/hbm/inventory/SlotCraftingOutput.java index 37c0fd450..7b8a1c86a 100644 --- a/src/main/java/com/hbm/inventory/SlotCraftingOutput.java +++ b/src/main/java/com/hbm/inventory/SlotCraftingOutput.java @@ -31,7 +31,7 @@ public class SlotCraftingOutput extends Slot { if(item == Item.getItemFromBlock(ModBlocks.machine_chemplant)) player.triggerAchievement(MainRegistry.achChemplant); - if(item == Item.getItemFromBlock(ModBlocks.concrete) || item == Item.getItemFromBlock(ModBlocks.concrete_asbestos)) + if(item == Item.getItemFromBlock(ModBlocks.concrete_smooth) || item == Item.getItemFromBlock(ModBlocks.concrete_asbestos)) player.triggerAchievement(MainRegistry.achConcrete); if(item == ModItems.ingot_polymer) player.triggerAchievement(MainRegistry.achPolymer); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index e352f2a77..74e150a55 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -38,6 +38,7 @@ import com.hbm.handler.EntityEffectHandler; import com.hbm.hazard.HazardSystem; import com.hbm.interfaces.IBomb; import com.hbm.handler.HTTPHandler; +import com.hbm.handler.HbmKeybinds.EnumKeybind; import com.hbm.handler.SiegeOrchestrator; import com.hbm.items.IEquipReceiver; import com.hbm.items.ModItems; @@ -72,6 +73,7 @@ import com.hbm.world.generator.TimedGenerator; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; @@ -190,7 +192,7 @@ public class ModEventHandler { } @SubscribeEvent - public void onEntityConstructing(EntityEvent.EntityConstructing event) { + public void onEntityConstructing(EntityEvent.EntityConstructing event) { if(event.entity instanceof EntityPlayer) { @@ -207,6 +209,14 @@ public class ModEventHandler { HbmLivingProps.getData(living); //ditto } } + + @SubscribeEvent + public void onPlayerChaangeDimension(PlayerChangedDimensionEvent event) { + EntityPlayer player = event.player; + HbmPlayerProps data = HbmPlayerProps.getData(player); + data.setKeyPressed(EnumKeybind.JETPACK, false); + data.setKeyPressed(EnumKeybind.DASH, false); + } @SubscribeEvent(priority = EventPriority.HIGHEST) public void onEntityDeathFirst(LivingDeathEvent event) { diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java index 69a0122e7..96e338e2a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java @@ -145,8 +145,8 @@ public class TileEntityMachineMixer extends TileEntityMachineBase implements INB if(recipe == null) return false; - tanks[0].setTankType(recipe.input1.type); - tanks[1].setTankType(recipe.input2.type); + tanks[0].setTankType(recipe.input1 != null ? recipe.input1.type : Fluids.NONE); + tanks[1].setTankType(recipe.input2 != null ? recipe.input2.type : Fluids.NONE); if(recipe.input1 != null && tanks[0].getFill() < recipe.input1.fill) return false; if(recipe.input2 != null && tanks[1].getFill() < recipe.input2.fill) return false; diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index cc4d7511b..5d11a6fa4 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -26,8 +26,8 @@ achievement.c20_5.desc=??? achievement.c20_5=Chapter [TWENTY POINT FIVE] achievement.c44.desc=Galvanized! I mean, zinc! achievement.c44=Chapter 44 -achievement.centrifuge.desc=centrifugal force is fake don't @ me -achievement.centrifuge=Centripetal Force +achievement.centrifuge.desc=centrifugal force is real don't @ me +achievement.centrifuge=Centrifugal Force achievement.chemplant.desc=Now you're thinking with chemicals! achievement.chemplant=The Factory Grows Pt. 2 achievement.chicagoPile.desc="How were the natives?" / "Very friendly."