diff --git a/changelog b/changelog index 7908d76a1..f1666faff 100644 --- a/changelog +++ b/changelog @@ -56,7 +56,7 @@ * Removed the old iron barrel * Removed the factory hull blocks * Removed the vacuum block that has been unused for like 5 years at this point - * Removed five of the 10 stuurdy ladder variants because they were hella ugly anyway + * Removed five of the 10 sturdy ladder variants because they were hella ugly anyway * Added a new alternate recipe "instant aggregate" in the chemical plant, turning 16 cobblestone into 8 gravel and 8 sand * Added a new alternate recipe for making obsidian in the chemical plant * Removed the water and steam geysers, which were so obscenely rare most people have never seen either one of them, and became functionally useless without the old geothermal generator @@ -70,3 +70,4 @@ * Fixed hopper IO for battery sockets being entirely broken * Fixed cargo elevators not dropping the correct amount of segments * Fixed broken config check causing smithing recipes in anvils to always be tier 1 +* Fixed potential client desync when placing or removing lids on a hot RBMK diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java index fb1093b42..492fd1aa0 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKRod.java @@ -42,7 +42,7 @@ public class RBMKRod extends RBMKBase { @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - if(meta >= this.offset && !RBMKDials.getMeltdownsDisabled(world)) { + if(!world.isRemote && meta >= this.offset && !RBMKDials.getMeltdownsDisabled(world)) { TileEntityRBMKRod tile = (TileEntityRBMKRod) world.getTileEntity(x, y, z); if(tile != null && tile.explodeOnBroken) { if(tile.slots[0] != null && tile.slots[0].getItem() instanceof ItemRBMKRod && ItemRBMKRod.getHullHeat(tile.slots[0]) >= 1500) { diff --git a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java index 08331008d..6d6e94c8f 100644 --- a/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ChemicalPlantRecipes.java @@ -134,7 +134,7 @@ public class ChemicalPlantRecipes extends GenericRecipes { this.register(new GenericRecipe("chem.obsidian").setup(60, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + ".stone") .inputFluids(new FluidStack(Fluids.WATER, 1_000), new FluidStack(Fluids.LAVA, 500), new FluidStack(Fluids.AIR, 4_000)) .outputItems(new ItemStack(Blocks.obsidian))); - this.register(new GenericRecipe("chem.aggregate").setup(320, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + ".stone") + this.register(new GenericRecipe("chem.aggregate").setupNamed(320, 500).setPools(GenericRecipes.POOL_PREFIX_DISCOVER + ".stone") .inputItems(new ComparableStack(Blocks.cobblestone, 16)) .outputItems(new ItemStack(Blocks.gravel, 8), new ItemStack(Blocks.sand, 8))); this.register(new GenericRecipe("chem.concrete").setup(100, 100) diff --git a/src/main/java/com/hbm/module/ParseMSES1.java b/src/main/java/com/hbm/module/ParseMSES1.java index 6a1729082..26aa50214 100644 --- a/src/main/java/com/hbm/module/ParseMSES1.java +++ b/src/main/java/com/hbm/module/ParseMSES1.java @@ -13,8 +13,8 @@ public class ParseMSES1 implements IParse { public EnumStatementReturn eval(ParseContext ctx, String line) { String lower = line.toLowerCase(Locale.US); - // jump point destination, skip - if(lower.startsWith("dest ") || lower.startsWith("# ")) { + // jump point destination or comment, skip + if(line.isEmpty() || lower.startsWith("dest ") || lower.startsWith("# ")) { return EnumStatementReturn.SKIP; } diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_assembler.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_assembler.png index 3101c24f9..34bf04e03 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_assembler.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_assembler.png differ