From f2574fc23262b7d9821353a432725392e414ecc2 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 20 May 2023 23:30:13 +0200 Subject: [PATCH] black lung balance, tram tooltip --- .../pile/BlockGraphiteDrilledBase.java | 1 - .../com/hbm/entity/train/TrainCargoTram.java | 3 -- .../java/com/hbm/extprop/HbmLivingProps.java | 2 +- .../com/hbm/handler/EntityEffectHandler.java | 2 +- .../java/com/hbm/handler/HTTPHandler.java | 25 ++++++++----- .../java/com/hbm/items/special/ItemTrain.java | 35 +++++++++++++++++- .../hbm/textures/models/weapons/ipleaker.png | Bin 0 -> 1025 bytes 7 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/models/weapons/ipleaker.png diff --git a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java index 00b520a54..58ec7bce2 100644 --- a/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java +++ b/src/main/java/com/hbm/blocks/machine/pile/BlockGraphiteDrilledBase.java @@ -133,7 +133,6 @@ public abstract class BlockGraphiteDrilledBase extends BlockFlammable implements if(item == ModItems.pile_rod_lithium) return new MetaBlock(ModBlocks.block_graphite_lithium); if(item == ModItems.cell_tritium) return new MetaBlock(ModBlocks.block_graphite_tritium); if(item == ModItems.pile_rod_detector) return new MetaBlock(ModBlocks.block_graphite_detector); - if(item == ModItems.ingot_graphite) return new MetaBlock(ModBlocks.block_graphite); return null; } diff --git a/src/main/java/com/hbm/entity/train/TrainCargoTram.java b/src/main/java/com/hbm/entity/train/TrainCargoTram.java index 8e5d7990f..e0d1aaa2a 100644 --- a/src/main/java/com/hbm/entity/train/TrainCargoTram.java +++ b/src/main/java/com/hbm/entity/train/TrainCargoTram.java @@ -1,7 +1,5 @@ package com.hbm.entity.train; -import java.util.Arrays; - import org.lwjgl.opengl.GL11; import com.hbm.blocks.rail.IRailNTM.TrackGauge; @@ -21,7 +19,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/extprop/HbmLivingProps.java b/src/main/java/com/hbm/extprop/HbmLivingProps.java index 73d5957af..da9d1d0c6 100644 --- a/src/main/java/com/hbm/extprop/HbmLivingProps.java +++ b/src/main/java/com/hbm/extprop/HbmLivingProps.java @@ -40,7 +40,7 @@ public class HbmLivingProps implements IExtendedEntityProperties { private int asbestos; public static final int maxAsbestos = 60 * 60 * 20; private int blacklung; - public static final int maxBlacklung = 60 * 60 * 20; + public static final int maxBlacklung = 2 * 60 * 60 * 20; private float radEnv; private float radBuf; private int bombTimer; diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index 845bbd9a6..2ccce3b4a 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -359,7 +359,7 @@ public class EntityEffectHandler { int bl = HbmLivingProps.getBlackLung(entity); - if(bl > 0 && bl < HbmLivingProps.maxBlacklung * 0.25) + if(bl > 0 && bl < HbmLivingProps.maxBlacklung * 0.5) HbmLivingProps.setBlackLung(entity, HbmLivingProps.getBlackLung(entity) - 1); } diff --git a/src/main/java/com/hbm/handler/HTTPHandler.java b/src/main/java/com/hbm/handler/HTTPHandler.java index e12832267..4efc054f4 100644 --- a/src/main/java/com/hbm/handler/HTTPHandler.java +++ b/src/main/java/com/hbm/handler/HTTPHandler.java @@ -17,15 +17,22 @@ public class HTTPHandler { public static String versionNumber = ""; public static void loadStats() { - - try { - - loadVersion(); - loadSoyuz(); - - } catch(IOException e) { - MainRegistry.logger.warn("Version checker failed!"); - } + + Thread versionChecker = new Thread("NTM Version Checker") { + + @Override + public void run() { + try { + loadVersion(); + loadSoyuz(); + } catch(IOException e) { + MainRegistry.logger.warn("Version checker failed!"); + } + } + + }; + + versionChecker.start(); } private static void loadVersion() throws IOException { diff --git a/src/main/java/com/hbm/items/special/ItemTrain.java b/src/main/java/com/hbm/items/special/ItemTrain.java index 9c5e65062..1a2648d38 100644 --- a/src/main/java/com/hbm/items/special/ItemTrain.java +++ b/src/main/java/com/hbm/items/special/ItemTrain.java @@ -1,5 +1,7 @@ package com.hbm.items.special; +import java.util.List; + import com.hbm.blocks.rail.IRailNTM; import com.hbm.entity.train.EntityRailCarBase; import com.hbm.entity.train.TrainCargoTram; @@ -7,23 +9,52 @@ import com.hbm.items.ItemEnumMulti; import com.hbm.util.EnumUtil; import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class ItemTrain extends ItemEnumMulti { public ItemTrain() { super(EnumTrainType.class, true, true); + this.setCreativeTab(CreativeTabs.tabTransport); + this.setMaxStackSize(1); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + EnumTrainType train = EnumUtil.grabEnumSafely(this.theEnum, stack.getItemDamage()); + + list.add(EnumChatFormatting.GREEN + "Engine: " + EnumChatFormatting.RESET + train.engine); + list.add(EnumChatFormatting.GREEN + "Gauge: " + EnumChatFormatting.RESET + train.gauge); + list.add(EnumChatFormatting.GREEN + "Max Speed: " + EnumChatFormatting.RESET + train.maxSpeed); + list.add(EnumChatFormatting.GREEN + "Acceleration: " + EnumChatFormatting.RESET + train.acceleration); + list.add(EnumChatFormatting.GREEN + "Engine Brake Threshold: " + EnumChatFormatting.RESET + train.brakeThreshold); + list.add(EnumChatFormatting.GREEN + "Parking Brake: " + EnumChatFormatting.RESET + train.parkingBrake); } public static enum EnumTrainType { - CARGO_TRAM(TrainCargoTram.class); + // Engine Gauge Max Speed Accel. Eng. Brake Parking Brake + CARGO_TRAM(TrainCargoTram.class, "Electric", "Standard Gauge", "10m/s", "0.2m/s", "<1m/s", "Yes"); public Class train; - private EnumTrainType(Class train) { + public String engine; + public String maxSpeed; + public String acceleration; + public String brakeThreshold; + public String parkingBrake; + public String gauge; + private EnumTrainType(Class train, String engine, String gauge, String maxSpeed, String acceleration, String brakeThreshold, String parkingBrake) { this.train = train; + this.engine = engine; + this.maxSpeed = maxSpeed; + this.acceleration = acceleration; + this.brakeThreshold = brakeThreshold; + this.parkingBrake = parkingBrake; + this.gauge = gauge; } } diff --git a/src/main/resources/assets/hbm/textures/models/weapons/ipleaker.png b/src/main/resources/assets/hbm/textures/models/weapons/ipleaker.png new file mode 100644 index 0000000000000000000000000000000000000000..ca0c368899e944b83f769574381aada5876f3a4d GIT binary patch literal 1025 zcmV+c1pfPpP)zfK!59LImDs%wMz6DbW6AzdR?Vnk7gPAq)@-hl_;B`SvU z0DXXN89T6Ks5+qx87d*MRskt#rTkMPZn+NB$zg1teZD`w-1oBt?i|jD4`177`%)p0 zD!tBO;BD`cx3fpDcJ`i~f0$2+h=k{o}41w=##jrFnnG12iUS#>v%sGtx)R8R;YDkuaH6%+!9>L7n^e=1-3ugd^N z{f@y4D3Z0_K6>`G3BAr?AUf{yL;yr}jIe|<;tE=1(DZ{s08t&L-adMgoc#A?0-}OK zfIh0D)Z0hWfmIn(6{0!{8!+**vST)~p8E}|)oL`EOlU9|I6Kl015q7=Pfd}KVS(ca z%OtJUY8Evm`f>7Zb(`x$?!kvs0%QEeOnUBhO4o#_$zz;QStCkB6Ig#VJQd5PU;8Qj z{ty);3cr$n_&phM3vp|rU_AN5^g4&++Ah@XgSS>cYjOW8p<3yKLcH`- ze!uJZlq$WB`-3Y}@(>-Osu3otF8wYAE+(oiZ_cia%K!fI(fXPYRSgnV0N>S#^qr~>Xr(PfNNHv)*NCYL^{ z&N99{_e~`&p$-sLP3DPevJE<}tZb5@NI+CInI|g06*`TD)4rvsX!_kFw?3*!Qley< zeAVhF9r9@UG3r;7+o+!jDcXfvwx^^JAyK2)$Wi~f--s@x;M-^zSq4piw&Xf9CEJB+ z%cVCqD$hUar@5c~KOaO@vyq9)!>@+2?ZfiijqImUA*!0p6E(cMRFogVBi15VL@hD?d@4;<(`i=rQJTu@StKz;Eh+wDw(6(K7OBJ$D=G1LAZp2B0_lwQ^8})n vnD8Bdu%I?gbXuZARFKFh{^WX?>MYzpUvvEnX6F