🅱️alls

This commit is contained in:
Bob 2025-07-27 17:10:39 +02:00
parent 66e0a0252b
commit 7f887a623a
8 changed files with 8815 additions and 7 deletions

View File

@ -15,6 +15,9 @@
* The alternate recipes for nitric acid and xenon gas in the chemical plant now require blueprints * 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) * 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 * 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
## Fixed ## Fixed
* Fixed a few assembler recipes using the old crafting numbers which sometimes exceed the stack limit * Fixed a few assembler recipes using the old crafting numbers which sometimes exceed the stack limit

View File

@ -84,6 +84,7 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
this.register(new GenericRecipe("ass.platednt").setup(600, 100).outputItems(new ItemStack(ModItems.plate_dineutronium, 4)) this.register(new GenericRecipe("ass.platednt").setup(600, 100).outputItems(new ItemStack(ModItems.plate_dineutronium, 4))
.inputItems(new OreDictStack(DNT.ingot(), 4), new ComparableStack(ModItems.powder_spark_mix, 2), new OreDictStack(DESH.ingot(), 1))); .inputItems(new OreDictStack(DNT.ingot(), 4), new ComparableStack(ModItems.powder_spark_mix, 2), new OreDictStack(DESH.ingot(), 1)));
// expensive parts
this.register(new GenericRecipe("ass.exsteelplating").setup(200, 400).outputItems(new ItemStack(ModItems.item_expensive, 1, EnumExpensiveType.STEEL_PLATING.ordinal())) this.register(new GenericRecipe("ass.exsteelplating").setup(200, 400).outputItems(new ItemStack(ModItems.item_expensive, 1, EnumExpensiveType.STEEL_PLATING.ordinal()))
.inputItems(new OreDictStack(STEEL.plateCast(), 4), new OreDictStack(TI.plate(), 4), new OreDictStack(STEEL.bolt(), 16))); .inputItems(new OreDictStack(STEEL.plateCast(), 4), new OreDictStack(TI.plate(), 4), new OreDictStack(STEEL.bolt(), 16)));
this.register(new GenericRecipe("ass.exheavyframe").setup(600, 800).outputItems(new ItemStack(ModItems.item_expensive, 1, EnumExpensiveType.HEAVY_FRAME.ordinal())) this.register(new GenericRecipe("ass.exheavyframe").setup(600, 800).outputItems(new ItemStack(ModItems.item_expensive, 1, EnumExpensiveType.HEAVY_FRAME.ordinal()))

View File

@ -51,6 +51,7 @@ public class CrackingRecipes extends SerializableRecipe {
cracking.put(Fluids.XYLENE, new Pair(new FluidStack(Fluids.AROMATICS, xyl_crack_aroma), new FluidStack(Fluids.PETROLEUM, xyl_crack_petro))); cracking.put(Fluids.XYLENE, new Pair(new FluidStack(Fluids.AROMATICS, xyl_crack_aroma), new FluidStack(Fluids.PETROLEUM, xyl_crack_petro)));
cracking.put(Fluids.HEATINGOIL_VACUUM, new Pair(new FluidStack(Fluids.HEATINGOIL, 80), new FluidStack(Fluids.REFORMGAS, 20))); cracking.put(Fluids.HEATINGOIL_VACUUM, new Pair(new FluidStack(Fluids.HEATINGOIL, 80), new FluidStack(Fluids.REFORMGAS, 20)));
cracking.put(Fluids.REFORMATE, new Pair(new FluidStack(Fluids.UNSATURATEDS, 40), new FluidStack(Fluids.REFORMGAS, 60))); cracking.put(Fluids.REFORMATE, new Pair(new FluidStack(Fluids.UNSATURATEDS, 40), new FluidStack(Fluids.REFORMGAS, 60)));
cracking.put(Fluids.BIOGAS, new Pair(new FluidStack(Fluids.PETROLEUM, 20), new FluidStack(Fluids.AROMATICS, 20)));
} }
public static Pair<FluidStack, FluidStack> getCracking(FluidType oil) { public static Pair<FluidStack, FluidStack> getCracking(FluidType oil) {

View File

@ -43,6 +43,7 @@ public class ItemPoolsRedRoom {
weighted(ModItems.gun_hangman, 0, 1, 1, 1), weighted(ModItems.gun_hangman, 0, 1, 1, 1),
weighted(ModItems.gun_mas36, 0, 1, 1, 1), weighted(ModItems.gun_mas36, 0, 1, 1, 1),
weighted(ModItems.item_secret, EnumSecretType.FOLLY.ordinal(), 1, 1, 1),
}; };
}}; }};

View File

@ -212,10 +212,9 @@ public class TileEntityMachineMiningLaser extends TileEntityMachineBase implemen
private void buildDam() { private void buildDam() {
if(worldObj.getBlock(targetX + 1, targetY, targetZ).getMaterial().isLiquid()) worldObj.setBlock(targetX + 1, targetY, targetZ, ModBlocks.barricade); for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if(worldObj.getBlock(targetX - 1, targetY, targetZ).getMaterial().isLiquid()) worldObj.setBlock(targetX - 1, targetY, targetZ, ModBlocks.barricade); if(worldObj.getBlock(targetX + dir.offsetX, targetY + dir.offsetY, targetZ + dir.offsetZ).getMaterial().isLiquid()) worldObj.setBlock(targetX + dir.offsetX, targetY + dir.offsetY, targetZ + dir.offsetZ, ModBlocks.barricade);
if(worldObj.getBlock(targetX, targetY, targetZ + 1).getMaterial().isLiquid()) worldObj.setBlock(targetX, targetY, targetZ + 1, ModBlocks.barricade); }
if(worldObj.getBlock(targetX, targetY, targetZ - 1).getMaterial().isLiquid()) worldObj.setBlock(targetX, targetY, targetZ - 1, ModBlocks.barricade);
} }
private void tryFillContainer(int x, int y, int z) { private void tryFillContainer(int x, int y, int z) {

View File

@ -3181,7 +3181,7 @@ item.item_expensive.bronze_tubes.name=Bronze Structural Elements
item.item_expensive.ferro_plating.name=Reinforced Ferrouranium Panels item.item_expensive.ferro_plating.name=Reinforced Ferrouranium Panels
item.item_expensive.heavy_frame.name=Heavy Framework item.item_expensive.heavy_frame.name=Heavy Framework
item.item_expensive.lead_plating.name=Radiation Resistant Plating item.item_expensive.lead_plating.name=Radiation Resistant Plating
item.item_expensive.steel_plating.name=Bolten Steel Plating item.item_expensive.steel_plating.name=Bolted Steel Plating
item.item_secret.aberrator.name=Aberrator Part item.item_secret.aberrator.name=Aberrator Part
item.item_secret.canister.name=Composition SB-26 item.item_secret.canister.name=Composition SB-26
item.item_secret.controller.name=Proprietary Control Unit item.item_secret.controller.name=Proprietary Control Unit

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB