From 44585d3c8b57b0786875f7ec09db80cbac51eee1 Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 24 Jul 2024 13:31:25 +0200 Subject: [PATCH] baa --- changelog | 4 +++- gradle.properties | 2 +- src/main/java/com/hbm/config/GeneralConfig.java | 2 +- src/main/java/com/hbm/items/tool/ItemWandD.java | 4 ++-- src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/MainRegistry.java | 2 +- .../hbm/particle/helper/ExplosionCreator.java | 9 +++------ .../machine/TileEntityElectrolyser.java | 4 ++-- .../hbm/textures/models/weapons/lasrifle.png | Bin 0 -> 2483 bytes .../hbm/textures/models/weapons/liberator.png | Bin 0 -> 4100 bytes 10 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/models/weapons/lasrifle.png create mode 100644 src/main/resources/assets/hbm/textures/models/weapons/liberator.png diff --git a/changelog b/changelog index 7dadbb87a..a66af51eb 100644 --- a/changelog +++ b/changelog @@ -10,4 +10,6 @@ * Fixed automatic crafting table filters being broken * Fixed missing localization for black lung death messages * Fixed disconnect caused by using a filter on the autocrafter's template output slot -* Fixed sentry turret "Brown" being uncraftable \ No newline at end of file +* Fixed sentry turret "Brown" being uncraftable +* Fixed instant crash caused by processing some bedrock ores in an electrolyzer +* Disabled unused debug code for reflection testing \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 673607d5a..e925744a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5027 +mod_build_number=5036 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index a4a0db045..b46a16a23 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -148,7 +148,7 @@ public class GeneralConfig { enableLBSMSimpleCentrifuge = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_recipeSimpleCentrifuge", "When enabled, enhances centrifuge outputs to make rare materials more common", true); enableLBSMUnlockAnvil = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_recipeUnlockAnvil", "When enabled, all anvil recipes are available at tier 1", true); enableLBSMSimpleCrafting = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_recipeSimpleCrafting", "When enabled, some uncraftable or more expansive items get simple crafting recipes. Scorched uranium also becomes washable", true); - enableLBSMSimpleMedicineRecipes = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_recipeSimpleMedicine", "When enabled, makes some medicine recipes (line ones that require bismuth) much more affordable", true); + enableLBSMSimpleMedicineRecipes = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_recipeSimpleMedicine", "When enabled, makes some medicine recipes (like ones that require bismuth) much more affordable", true); enableLBSMSafeCrates = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_safeCrates", "When enabled, prevents crates from becoming radioactive", true); enableLBSMSafeMEDrives = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_safeMEDrives", "When enabled, prevents ME Drives and Portable Cells from becoming radioactive", true); enableLBSMIGen = CommonConfig.createConfigBool(config, CATEGORY_LBSM, "LBSM_iGen", "When enabled, restores the industrial generator to pre-nerf power", true); diff --git a/src/main/java/com/hbm/items/tool/ItemWandD.java b/src/main/java/com/hbm/items/tool/ItemWandD.java index d23f5d5ed..348203890 100644 --- a/src/main/java/com/hbm/items/tool/ItemWandD.java +++ b/src/main/java/com/hbm/items/tool/ItemWandD.java @@ -43,13 +43,13 @@ public class ItemWandD extends Item { Component comp = new RuralHouse1(world.rand, i, j); comp.addComponentParts(world, world.rand, new StructureBoundingBox(i, j, i + 32, j + 32));*/ - ExplosionVNT vnt = new ExplosionVNT(world, pos.blockX + 0.5, pos.blockY + 1, pos.blockZ + 0.5, 40F); + ExplosionVNT vnt = new ExplosionVNT(world, pos.blockX + 0.5, pos.blockY + 1, pos.blockZ + 0.5, 15F); vnt.makeStandard(); vnt.setSFX(); vnt.setBlockAllocator(new BlockAllocatorStandard(32)); vnt.explode(); - ExplosionCreator.composeEffectLarge(world, pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5); + ExplosionCreator.composeEffectStandard(world, pos.blockX + 0.5, pos.blockY + 0.5, pos.blockZ + 0.5); /*for(int i = 0; i < 10; i++) { NBTTagCompound data = new NBTTagCompound(); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index eb963eb3d..d71f37cbf 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5027)"; + public static final String VERSION = "1.0.27 BETA (5036)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 1ef4d7228..4dde96ef6 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -265,7 +265,7 @@ public class MainRegistry { polaroidID = rand.nextInt(18) + 1; } - ShadyUtil.test(); + //ShadyUtil.test(); loadConfig(PreEvent); HbmPotion.init(); diff --git a/src/main/java/com/hbm/particle/helper/ExplosionCreator.java b/src/main/java/com/hbm/particle/helper/ExplosionCreator.java index 1eee1591d..2e553a958 100644 --- a/src/main/java/com/hbm/particle/helper/ExplosionCreator.java +++ b/src/main/java/com/hbm/particle/helper/ExplosionCreator.java @@ -40,7 +40,7 @@ public class ExplosionCreator implements IParticleCreator { data.setFloat("debrisHorizontalDeviation", debrisHorizontalDeviation); data.setFloat("debrisVerticalOffset", debrisVerticalOffset); data.setFloat("soundRange", soundRange); - IParticleCreator.sendPacket(world, x, y, z, Math.max(200, (int) soundRange), data); + IParticleCreator.sendPacket(world, x, y, z, Math.max(300, (int) soundRange), data); } /** Downscaled for small bombs */ @@ -73,8 +73,8 @@ public class ExplosionCreator implements IParticleCreator { if(dist <= soundRange) { while(ModEventHandlerClient.soundLock); ModEventHandlerClient.soundLock = true; - String sound = dist <= soundRange * 0.33 ? "hbm:weapon.explosionLargeNear" : "hbm:weapon.explosionLargeFar"; - ModEventHandlerClient.delayedSounds.add(new DelayedSound(sound, (int) (dist / speedOfSound), x, y, z, 1000F, 1F)); + String sound = dist <= soundRange * 0.4 ? "hbm:weapon.explosionLargeNear" : "hbm:weapon.explosionLargeFar"; + ModEventHandlerClient.delayedSounds.add(new DelayedSound(sound, (int) (dist / speedOfSound), x, y, z, 1000F, 0.9F + rand.nextFloat() * 0.2F)); ModEventHandlerClient.soundLock = false; } @@ -104,9 +104,6 @@ public class ExplosionCreator implements IParticleCreator { double oX = rand.nextGaussian() * debrisHorizontalDeviation; double oY = debrisVerticalOffset; double oZ = rand.nextGaussian() * debrisHorizontalDeviation; - int ix = (int) Math.floor(x + oX); - int iy = (int) Math.floor(y + oY); - int iz = (int) Math.floor(z + oZ); int cX = (int) Math.floor(x + oX + 0.5); int cY = (int) Math.floor(y + oY + 0.5); int cZ = (int) Math.floor(z + oZ + 0.5); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java index 8ff08ca05..18cf9f14a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java @@ -320,12 +320,12 @@ public class TileEntityElectrolyser extends TileEntityMachineBase implements IEn ElectrolysisMetalRecipe recipe = ElectrolyserMetalRecipes.getRecipe(slots[14]); if(recipe == null) return false; - if(leftStack != null) { + if(leftStack != null && recipe.output1 != null) { if(recipe.output1.material != leftStack.material) return false; if(recipe.output1.amount + leftStack.amount > this.maxMaterial) return false; } - if(rightStack != null) { + if(rightStack != null && recipe.output2 != null) { if(recipe.output2.material != rightStack.material) return false; if(recipe.output2.amount + rightStack.amount > this.maxMaterial) return false; } diff --git a/src/main/resources/assets/hbm/textures/models/weapons/lasrifle.png b/src/main/resources/assets/hbm/textures/models/weapons/lasrifle.png new file mode 100644 index 0000000000000000000000000000000000000000..6d0b454446ba5d4fcd3c58c2ea9542ead18695d0 GIT binary patch literal 2483 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/models/weapons/liberator.png b/src/main/resources/assets/hbm/textures/models/weapons/liberator.png new file mode 100644 index 0000000000000000000000000000000000000000..d4536cee0c7d7961bb9952a615e9bcc404572b98 GIT binary patch literal 4100 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