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 000000000..6d0b45444 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/lasrifle.png differ 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 000000000..d4536cee0 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/liberator.png differ