From afd75b26af6831422bdc81839bf8d494e691e139 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 9 Aug 2023 22:28:14 +0200 Subject: [PATCH] assets, fixes --- src/main/java/com/hbm/main/MainRegistry.java | 4 ++-- .../machine/TileEntityElectrolyser.java | 1 + .../textures/models/projectiles/leadburster.png | Bin 0 -> 983 bytes .../hbm/textures/models/weapons/congolake.png | Bin 0 -> 3306 bytes 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/models/projectiles/leadburster.png create mode 100644 src/main/resources/assets/hbm/textures/models/weapons/congolake.png diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 6b7451986..438847446 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -955,6 +955,8 @@ public class MainRegistry { WeaponConfig.loadFromConfig(config); MobConfig.loadFromConfig(config); StructureConfig.loadFromConfig(config); + + config.save(); try { if(GeneralConfig.enableThermosPreventer && Class.forName("thermos.Thermos") != null) { @@ -967,8 +969,6 @@ public class MainRegistry { + "change Thermos' config anyway so that extra change in NTM's config can't be that big of a burden."); } } catch(ClassNotFoundException e) { } - - config.save(); } private static HashSet ignoreMappings = new HashSet(); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java index 5f1801c59..8d34ffa2c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java @@ -308,6 +308,7 @@ public class TileEntityElectrolyser extends TileEntityMachineBase implements IEn if(this.tanks[3].getFill() < 100) return false; ElectrolysisMetalRecipe recipe = ElectrolyserMetalRecipes.getRecipe(slots[14]); + if(recipe == null) return false; if(leftStack != null) { if(recipe.output1.material != leftStack.material) return false; diff --git a/src/main/resources/assets/hbm/textures/models/projectiles/leadburster.png b/src/main/resources/assets/hbm/textures/models/projectiles/leadburster.png new file mode 100644 index 0000000000000000000000000000000000000000..281f6ca1fb66c9ce9ba6d5cd39dc942f8ce3edae GIT binary patch literal 983 zcmV;|11S87P)pJ(=m_d^9cax z`+n_fSV3=0q;xc&9mZqXy1#+QaUOl&qwo9G5dhGXl*ycs&9!#q4E0{y&1G3Ozpm?6 zBl+3d+^@zwm;r6cC}rS0&qZf2qN8MOGra4%ZB_ZV8QWCW%B9w$Wa$j)%B z!4Z@*eP6?kD0pS(S;^Eo#^!lLJ(WvPbCqNL5d&T^z@Kybv62x!325^?Z+2x*L}z$8 zPxZ*5%d%`4;K9b5q3j%nx)pexNY21Y@(z6pUQ?mT6wB!EWq6(1YmfVt(NQ0e#|JeQ zv7qG!?=qv55Y-?GqHJKKxN7^GL-ku*1wTV8dj(WXV1}qf$;&DSMzk*l!sx0~#%4~~ z!~m7J@K_Y_mGP>d+xGlhX>Lh|S;A;dnJlL_gKD!zWhl3K9gftjY_w~h+TKVH#W3z` zBgGYkYhpoG2(j@IqoN)3&iEur;&mEUP$`}DXB6KnYsl_wb3%4AsG7jTilOK8xvd5> zV?1?hvOQ)_ZFX3?<~*f+66O279PloN`o4e1fD*j%d#*&AzsCu+=`FCoNaFS7HCR$s zrO!$}niDziCsDs9cgWZvQ(;yxxVM~U zlxVL$j`*w*5DZYeT7&45SxLUO608|lYpGP4$JZ}H{!_t%;FW{{P_9-bMVmV1+&T4yO|Y%)Q^p1@U;{3r+2)B-<&PpPv)X-$P$A+?jk zFkqUd@TDr%Rpb6$!!U%(Mn*CGS@-#VR4OwXR>(gySXoBRbr~UZs-a|j&28YF!f5aJ zyA(Vgj~hkJ0qlrrnu>;dX6^a7Qj-mqD!^H{-gIiv>aqX76&4f{@%)1!_10~%0B|qIx@Y4KR5sY002ovPDHLk FV1gw4){+1K literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/weapons/congolake.png b/src/main/resources/assets/hbm/textures/models/weapons/congolake.png new file mode 100644 index 0000000000000000000000000000000000000000..dd3c9cd71c018fbcbae3a1710f1cb525d93e3166 GIT binary patch literal 3306 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 literal 0 HcmV?d00001