diff --git a/changelog b/changelog index b819e17ab..bc517c4ea 100644 --- a/changelog +++ b/changelog @@ -1,53 +1,15 @@ -## Added -* Blueprint booklets - * Can be found in worldgen - * Using it will create one random blueprint of the same type as the booklet -* Liquid concrete - * It's conk but liquid -* Rebar - * When hooked up to liquid concrete using pipes, will fill to create reinforced concrete - * Fills bottom to top, so connect the pipes to the top - * The rendering on this is still experimental, so don't overdo it with how large of an area you're casting -* Rebar placer - * Can be configured with different types of concrete, reinforced or not, or even colored - * Rebar created with the rebar placer will remember its type and assume it when being filled with liquid concrete -* PUREX - * Chemplant-like nuclear fuel reprocessing machine - * Handles all the nuclear fuel reprocessing that was previously done by the standard centrifuge - * All reprocessing recipes now require both kerosene and nitric acid - * Also handles the vitrification recipes and the thorium salt reprocessing from the chemical plant - * Comes with new schrabidium extraction recipes from MEP/MEN fuels using schrabidic acid (yield is twice the schrabidium cost for acid used) +## Added (last time, i forgor) +* RBMK autoloader + * Can be placed on top of RBMK fuel rods + * Can be configured to switch fuel rods in 5% depletion increments + * Usable with all forms of item transport like conveyors and pneumatic tubes ## Changed -* The alternate recipes for nitric acid and xenon gas in the chemical plant now require blueprints -* The chemical plant now has a recipe for making cobblestone from 25mB of lava (which can be liquefacted into even more lava, useful for cobblestone generation) -* Removed the old arc furnace -* Mining lasers now build up barricades in all directions and not just horizontal ones, preventing potential deadlocks due to liquid flowing in from above -* One of the new secret parts for making a certain weapon is now obtainable again via red rooms -* Biogas can now be cracked into aromatics and petroleum gas -* Custom missile part recipes have been added to the new assembler -* Mini nukes are now made from weapon steel instead of regular steel -* Meteorite ingots are now made from meteorite powder, not blocks -* Starmetal now requires meteorite ingots instead of blocks -* Added auto switch groups - * The new standardized processing machines (assembler, chemplant, purex) can now have recipes that are grouped - * Recipes in groups will accept non-recipe items, if the item is used in another recipe from that same group - * When this happens, the recipe switches automatically, if possible - * This means that many PUREX recycling recipes and the ingot to plate recipes don't need dedicated machines for every single recipe, rather only one for that auto switch group -* The tooltip of the chosen recipe on the recipe selector now renders in the bottom left corner instead of following the mouse, preventing an issue where the tooltip is cut off on larger GUI scales -* Expensive mode has been changed - * Instead of using heavy components for most things, there's now "expensive" items that are used by many assembler recipes - * "Expensive" items replace some of the microcrafting that's part of the recipe, meaning that expensive mode recipes are generally simpler (but require way more materials) - * All heavy components have been annihilated and any recipes that may still use them (e.g. from old configs) default to using cast plates instead -* Removed the assembly factory's recipe, as it still uses the deprecated recipe set - * A new assembly factory will be added soon -* All recently deprecated machines have been removed from the creative tabs +* Replaced "re-enrichment" in the PUREX recipes with "reprocessing" ## Fixed -* Fixed a few assembler recipes using the old crafting numbers which sometimes exceed the stack limit - * As an extra safeguard, the recipe loader now throws an exception if that happens -* Fixed dupe caused by the breeding reactor -* Fixed a potential crash caused by a change done to tile entity proxies in relation to EnergyControl -* Fixed the assembler achievement still using the old one -* Fixed the RBMK auto control rod's function not syncing to the client properly -* Fixed crash caused by new standardized machine recipes with chance-based output when they output nothing +* Fixed many of the PUREX' recipe categories simply not processing + * It worked last time I swear +* Fixed life-ending issue where the assembler achievement's icon was incorrect +* Fixed RBMK autoloader not having a recipe + * Ow \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ca80c122b..e40665d77 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=5412 +mod_build_number=5412H1 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java index b0efb41f8..b3014e716 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java @@ -464,6 +464,9 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.rbmk").setup(100, 100).outputItems(new ItemStack(ModBlocks.rbmk_blank, 1)) .inputItems(new ComparableStack(ModBlocks.concrete_asbestos, 4), new OreDictStack(STEEL.plateCast(), 4), new OreDictStack(CU.plate(), 8), new ComparableStack(ModItems.plate_polymer, 4)) .inputItemsEx(new ComparableStack(ModBlocks.concrete_asbestos, 4), new ComparableStack(ModItems.item_expensive, 1, EnumExpensiveType.FERRO_PLATING), new OreDictStack(CU.plate(), 16))); + this.register(new GenericRecipe("ass.rbmkautoloader").setup(100, 100).outputItems(new ItemStack(ModBlocks.rbmk_autoloader, 1)) + .inputItems(new OreDictStack(STEEL.plateWelded(), 4), new OreDictStack(PB.plateCast(), 4), new OreDictStack(B.ingot(), 4), new ComparableStack(ModItems.motor, 3)) + .inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModItems.motor_desh, 3))); // fusion reactor this.register(new GenericRecipe("ass.fusioncore").setup(600, 100).outputItems(new ItemStack(ModBlocks.struct_iter_core, 1)) diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 4f891c49e..543f77ad9 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 (5412)"; + public static final String VERSION = "1.0.27 BETA (5412H1)"; //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 0a9fe875e..f797b0de3 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -718,7 +718,7 @@ public class MainRegistry { //progression achieves achBurnerPress = new Achievement("achievement.burnerPress", "burnerPress", 0, 0, new ItemStack(ModBlocks.machine_press), null).initIndependentStat().registerStat(); achBlastFurnace = new Achievement("achievement.blastFurnace", "blastFurnace", 1, 3, new ItemStack(ModBlocks.machine_difurnace_off), achBurnerPress).initIndependentStat().registerStat(); - achAssembly = new Achievement("achievement.assembly", "assembly", 3, -1, new ItemStack(ModBlocks.machine_assembler), achBurnerPress).initIndependentStat().registerStat(); + achAssembly = new Achievement("achievement.assembly", "assembly", 3, -1, new ItemStack(ModBlocks.machine_assembly_machine), achBurnerPress).initIndependentStat().registerStat(); achSelenium = new Achievement("achievement.selenium", "selenium", 3, 2, ModItems.ingot_starmetal, achBurnerPress).initIndependentStat().setSpecial().registerStat(); achChemplant = new Achievement("achievement.chemplant", "chemplant", 6, -1, new ItemStack(ModBlocks.machine_chemical_plant), achAssembly).initIndependentStat().registerStat(); achConcrete = new Achievement("achievement.concrete", "concrete", 6, -4, new ItemStack(ModBlocks.concrete), achChemplant).initIndependentStat().registerStat(); diff --git a/src/main/java/com/hbm/module/machine/ModuleMachineBase.java b/src/main/java/com/hbm/module/machine/ModuleMachineBase.java index f5f4827e5..0a27c56d6 100644 --- a/src/main/java/com/hbm/module/machine/ModuleMachineBase.java +++ b/src/main/java/com/hbm/module/machine/ModuleMachineBase.java @@ -53,6 +53,7 @@ public abstract class ModuleMachineBase { ItemStack itemToSwitchBy = slots[inputSlots[0]]; List recipes = (List) this.getRecipeSet().autoSwitchGroups.get(recipe.autoSwitchGroup); if(recipes != null) for(GenericRecipe nextRec : recipes) { + if(nextRec.getInternalName().equals(this.recipe)) continue; if(nextRec.inputItem == null) continue; if(nextRec.inputItem[0].matchesRecipe(itemToSwitchBy, true)) { // perform the switch this.recipe = nextRec.getInternalName(); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 26b2baf6f..444cc8a7c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -4472,6 +4472,7 @@ tile.machine_press.name=Befeuerte Presse tile.machine_puf6_tank.name=Plutoniumhexafluorid-Tank tile.machine_pumpjack.name=Pferdekopfpumpe tile.machine_purex.name=PUREX +tile.machine_purex.desc=Wiederaufbereitungsmaschine für Kernbrennstoff.$Die meisten Rezepte benötigen Kerosin und Salpetersäure. tile.machine_pyrooven.name=Pyrolyseofen tile.machine_radar.name=Radar tile.machine_radar_large.name=Großes Radar diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index d1c47cebc..32d100935 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -185,12 +185,12 @@ armorMod.type.servo=Servos armorMod.type.special=Special autoswitch=Part of auto switch group "%s"$Recipe changes based on first ingredient -autoswitch.plate=Re-Enrichment Plate Fuel +autoswitch.plate=Reprocessing Plate Fuel autoswitch.plates=Metal Plates -autoswitch.pwr=Re-Enrichment PWR Fuel +autoswitch.pwr=Reprocessing PWR Fuel autoswitch.schrab=Schrabidium Extraction -autoswitch.watz=Re-Enrichment Watz Pellet -autoswitch.zirnox=Re-Enrichment ZIRNOX Fuel +autoswitch.watz=Reprocessing Watz Pellet +autoswitch.zirnox=Reprocessing ZIRNOX Fuel battery.mode.buffer=Input/Output Mode battery.mode.input=Input Mode @@ -4777,7 +4777,7 @@ potion.hbm_stability=Stability potion.hbm_taint=Tainted potion.hbm_telekinesis=! ! ! -purex.recycle=Re-enrichment of %s +purex.recycle=Reprocessing of %s purex.schrab=Schrabidium extraction from %s radar.clearMap=Clear Map @@ -5609,6 +5609,7 @@ tile.machine_press.name=Burner Press tile.machine_puf6_tank.name=Plutonium Hexafluoride Tank tile.machine_pumpjack.name=Pumpjack tile.machine_purex.name=PUREX +tile.machine_purex.desc=Reprocessing machine for many nuclear fuels.$Most recipes require kerosene and nitric acid. tile.machine_pyrooven.name=Pyrolysis Oven tile.machine_radar.name=Radar tile.machine_radar_large.name=Large Radar