diff --git a/changelog b/changelog index 954da9f28..2d40670a6 100644 --- a/changelog +++ b/changelog @@ -1,16 +1,3 @@ ## Changed -* The ambient radiation generator's functionality and recipe have been disabled as it is being deprecated -* The pyrolysis oven is now compatible with overdrive upgrades -* Steel walls and corners no longer use TESRs for rendering, making them more performant at large scale and fixing any oddities regarding their rendering -* Steel walls and corners can now be rotated using the screwdriver (right click for clockwise, shift click for counter-clockwise) -* Steel walls and corners now use new textures as well as slightly cleaner models -* Steel corner bounding boxes now closely match their model - -## Fixed -* Fixed crash caused by the pyrolysis oven on servers - * Due this type of issue happening constantly, the GUI provider system no longer uses any client-only code -* Fixed small black bar rendering under the arrow box of NEI universal handlers when using the NH NEI fork -* Fixed desh screwdrivers not being usable for picking locks -* Possibly fixed an issue caused by MouseTweaks (in combination with other mods) duplicating click input (I can't replicate the issue so I can at best guess) -* Fixed pyrolysis ovens not being able to operate due to the output buffer being full, despite the buffer being a different type -* Fixed a vanilla bug in the standard block renderer causing boxduct bends to have incorrect UV on the -Z and +X sides \ No newline at end of file +* The fine soot recipe in the pyrolysis oven now only needs 4 tar +* Overdrive upgrades now use fullerite instead of lithium crystals \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index de8842189..9550cd93d 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -2736,7 +2736,7 @@ public class ModBlocks { register(steel_scaffold); GameRegistry.registerBlock(steel_grate, steel_grate.getUnlocalizedName()); register(steel_grate_wide); - register(scaffold_dynamic); + //register(scaffold_dynamic); GameRegistry.registerBlock(deco_pipe, ItemBlockBase.class, deco_pipe.getUnlocalizedName()); GameRegistry.registerBlock(deco_pipe_rusted, ItemBlockBase.class, deco_pipe_rusted.getUnlocalizedName()); GameRegistry.registerBlock(deco_pipe_green, ItemBlockBase.class, deco_pipe_green.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index af36e0fbe..5b52a30fd 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -363,7 +363,7 @@ public class AssemblerRecipes extends SerializableRecipe { new ComparableStack(ModItems.upgrade_speed_3, 1), new ComparableStack(ModItems.upgrade_effect_3, 1), new OreDictStack(DESH.ingot(), 16), - new ComparableStack(ModItems.crystal_lithium, 4), + new ComparableStack(ModItems.ingot_cft, 2), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.ADVANCED), }, 200); makeRecipe(new ComparableStack(ModItems.upgrade_overdrive_2, 1), new AStack[] { @@ -371,7 +371,7 @@ public class AssemblerRecipes extends SerializableRecipe { new ComparableStack(ModItems.upgrade_speed_3, 1), new ComparableStack(ModItems.upgrade_effect_3, 1), new OreDictStack(BIGMT.ingot(), 16), - new ComparableStack(ModItems.crystal_lithium, 8), + new ComparableStack(ModItems.ingot_cft, 6), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CAPACITOR_BOARD), }, 300); makeRecipe(new ComparableStack(ModItems.upgrade_overdrive_3, 1), new AStack[] { @@ -379,7 +379,7 @@ public class AssemblerRecipes extends SerializableRecipe { new ComparableStack(ModItems.upgrade_speed_3, 1), new ComparableStack(ModItems.upgrade_effect_3, 1), new OreDictStack(STAR.ingot(), 16), - new ComparableStack(ModItems.crystal_lithium, 16), + new ComparableStack(ModItems.ingot_cft, 8), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BISMOID), }, 500); diff --git a/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java b/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java index 456c8af93..384783d3f 100644 --- a/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java @@ -92,7 +92,7 @@ public class PyroOvenRecipes extends SerializableRecipe { .out(new FluidStack(Fluids.SYNGAS, 1_000)).out(new ItemStack(Items.coal, 1, 1))); //soot from tar recipes.add(new PyroOvenRecipe(40) - .out(new FluidStack(Fluids.HYDROGEN, 250)).in(new OreDictStack(ANY_TAR.any(), 8)) + .out(new FluidStack(Fluids.HYDROGEN, 250)).in(new OreDictStack(ANY_TAR.any(), 4)) .out(new FluidStack(Fluids.CARBONDIOXIDE, 1_000)).out(DictFrame.fromOne(ModItems.powder_ash, EnumAshType.SOOT))); //heavyoil from coal recipes.add(new PyroOvenRecipe(100) diff --git a/src/main/resources/assets/hbm/textures/items/ingot_beskar_single_alt.png b/src/main/resources/assets/hbm/textures/items/ingot_beskar_single_alt.png new file mode 100644 index 000000000..0f0a229de Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_beskar_single_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_ceramic.png b/src/main/resources/assets/hbm/textures/items/ingot_ceramic.png new file mode 100644 index 000000000..6b0805212 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_ceramic.png differ