and some other stuff

This commit is contained in:
HbmMods 2026-07-24 17:50:32 +02:00
parent 77f044ebdd
commit 25d31aa58c
8 changed files with 60 additions and 43 deletions

View File

@ -26,6 +26,7 @@ public class BlockForgottenBrick extends BlockMulti {
private IIcon iconHole; private IIcon iconHole;
private IIcon iconEmpty; private IIcon iconEmpty;
private IIcon iconPlanks; private IIcon iconPlanks;
private IIcon iconBricks;
public static final int META_DEFAULT = 0; public static final int META_DEFAULT = 0;
public static final int META_BW = 1; public static final int META_BW = 1;
@ -33,6 +34,7 @@ public class BlockForgottenBrick extends BlockMulti {
public static final int META_HOLE = 3; public static final int META_HOLE = 3;
public static final int META_HOLE_EMPTY = 4; public static final int META_HOLE_EMPTY = 4;
public static final int META_NULLROOM_WOOD = 5; public static final int META_NULLROOM_WOOD = 5;
public static final int META_NULLROOM_STONE = 6;
public BlockForgottenBrick() { public BlockForgottenBrick() {
super(Material.rock); super(Material.rock);
@ -49,6 +51,7 @@ public class BlockForgottenBrick extends BlockMulti {
this.iconHole = reg.registerIcon(RefStrings.MODID + ":brick_forgotten_hole"); this.iconHole = reg.registerIcon(RefStrings.MODID + ":brick_forgotten_hole");
this.iconEmpty = reg.registerIcon(RefStrings.MODID + ":brick_forgotten_hole_empty"); this.iconEmpty = reg.registerIcon(RefStrings.MODID + ":brick_forgotten_hole_empty");
this.iconPlanks = reg.registerIcon(RefStrings.MODID + ":nr_planks"); this.iconPlanks = reg.registerIcon(RefStrings.MODID + ":nr_planks");
this.iconBricks = reg.registerIcon(RefStrings.MODID + ":nr_stone");
} }
@Override @Override
@ -73,6 +76,9 @@ public class BlockForgottenBrick extends BlockMulti {
if(meta == META_NULLROOM_WOOD) { if(meta == META_NULLROOM_WOOD) {
return this.iconPlanks; return this.iconPlanks;
} }
if(meta == META_NULLROOM_STONE) {
return this.iconBricks;
}
if(side == 0 || side == 1) return this.iconTop; if(side == 0 || side == 1) return this.iconTop;
return this.blockIcon; return this.blockIcon;
@ -94,7 +100,7 @@ public class BlockForgottenBrick extends BlockMulti {
return false; return false;
} }
@Override public int getSubCount() { return 6; } @Override public int getSubCount() { return 7; }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View File

@ -30,6 +30,7 @@ import com.hbm.items.machine.ItemBatterySC.EnumBatterySC;
import com.hbm.items.machine.ItemCircuit.EnumCircuitType; import com.hbm.items.machine.ItemCircuit.EnumCircuitType;
import com.hbm.items.machine.ItemDrillbit.EnumDrillType; import com.hbm.items.machine.ItemDrillbit.EnumDrillType;
import com.hbm.items.machine.ItemPACoil.EnumCoilType; import com.hbm.items.machine.ItemPACoil.EnumCoilType;
import com.hbm.items.machine.ItemPileRodMK2.EnumPileRod;
import com.hbm.items.machine.ItemPistons.EnumPistonType; import com.hbm.items.machine.ItemPistons.EnumPistonType;
import com.hbm.items.weapon.ItemAmmoHIMARS; import com.hbm.items.weapon.ItemAmmoHIMARS;
import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze;
@ -160,6 +161,21 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
this.register(new GenericRecipe("ass.protoreactor").setup(200, 100).outputItems(new ItemStack(ModItems.dysfunctional_reactor, 1)) this.register(new GenericRecipe("ass.protoreactor").setup(200, 100).outputItems(new ItemStack(ModItems.dysfunctional_reactor, 1))
.inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(PB.plateCast(), 4), new ComparableStack(ModItems.rod_quad_empty, 10), new OreDictStack(KEY_BROWN, 3))); .inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(PB.plateCast(), 4), new ComparableStack(ModItems.rod_quad_empty, 10), new OreDictStack(KEY_BROWN, 3)));
// pile rods
String autoPileRod = "autoswitch.pilerod";
this.register(new GenericRecipe("ass.pilepabe").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RA226BE.ordinal()))
.inputItems(new ComparableStack(ModItems.billet_ra226be, 3)).setGroup(autoPileRod, INSTANCE));
this.register(new GenericRecipe("ass.pilepobe").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PO210BE.ordinal()))
.inputItems(new ComparableStack(ModItems.billet_po210be, 3)).setGroup(autoPileRod, INSTANCE));
this.register(new GenericRecipe("ass.pilezr").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.ZR.ordinal()))
.inputItems(new OreDictStack(ZR.billet(), 3)).setGroup(autoPileRod, INSTANCE));
this.register(new GenericRecipe("ass.pilenu").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.NU.ordinal()))
.inputItems(new OreDictStack(U.billet(), 3)).setGroup(autoPileRod, INSTANCE));
this.register(new GenericRecipe("ass.pilepu239").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PU239.ordinal()))
.inputItems(new OreDictStack(PU239.billet(), 3)).setGroup(autoPileRod, INSTANCE));
this.register(new GenericRecipe("ass.pilergp").setup(40, 200).outputItems(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RGP.ordinal()))
.inputItems(new OreDictStack(PURG.billet(), 3)).setGroup(autoPileRod, INSTANCE));
// powders // powders
String autoCyclotron = "autoswitch.cyclotron"; String autoCyclotron = "autoswitch.cyclotron";
this.register(new GenericRecipe("ass.partlith").setup(40, 100).outputItems(new ItemStack(ModItems.part_lithium, 8)) this.register(new GenericRecipe("ass.partlith").setup(40, 100).outputItems(new ItemStack(ModItems.part_lithium, 8))

View File

@ -13,6 +13,7 @@ import com.hbm.inventory.fluid.Fluids;
import com.hbm.inventory.recipes.loader.GenericRecipes; import com.hbm.inventory.recipes.loader.GenericRecipes;
import com.hbm.items.ModItems; import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemPWRFuel.EnumPWRFuel; import com.hbm.items.machine.ItemPWRFuel.EnumPWRFuel;
import com.hbm.items.machine.ItemPileRodMK2.EnumPileRod;
import com.hbm.items.machine.ItemWatzPellet.EnumWatzType; import com.hbm.items.machine.ItemWatzPellet.EnumWatzType;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -60,21 +61,23 @@ public class PUREXRecipes extends GenericRecipes<PUREXRecipe> {
//CP-1 //CP-1
String autoPile = "autoswitch.pile"; String autoPile = "autoswitch.pile";
this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu239").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this)
.inputItems(new ComparableStack(ModItems.pile_rod_plutonium)) .inputItems(new ComparableStack(ModItems.pile_rod, 1, EnumPileRod.PU239))
.inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100))
.outputItems(new ItemStack(ModItems.billet_pu239, 2),
new ItemStack(ModItems.billet_uranium, 1))
.setIconToFirstIngredient());
this.register((PUREXRecipe) new PUREXRecipe("purex.pilergp").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this)
.inputItems(new ComparableStack(ModItems.pile_rod, 1, EnumPileRod.RGP))
.inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100)) .inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100))
.outputItems(new ItemStack(ModItems.billet_pu_mix, 2), .outputItems(new ItemStack(ModItems.billet_pu_mix, 2),
new ItemStack(ModItems.billet_uranium, 1), new ItemStack(ModItems.billet_uranium, 1))
new ItemStack(ModItems.plate_iron, 2))
.setIconToFirstIngredient()); .setIconToFirstIngredient());
this.register((PUREXRecipe) new PUREXRecipe("purex.pilewaste").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this)
this.register((PUREXRecipe) new PUREXRecipe("purex.pilepu239").setup(40, pilePower).setNameWrapper("purex.recycle").setGroup(autoPile, this) .inputItems(new ComparableStack(ModItems.pile_rod, 1, EnumPileRod.WASTE))
.inputItems(new ComparableStack(ModItems.pile_rod_pu239))
.inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100)) .inputFluids(new FluidStack(Fluids.SULFURIC_ACID, 100))
.outputItems(new ItemStack(ModItems.billet_pu239, 1), .outputItems(new ItemStack(ModItems.billet_nuclear_waste, 2),
new ItemStack(ModItems.billet_pu_mix, 1), new ItemStack(ModItems.billet_polonium, 1))
new ItemStack(ModItems.billet_uranium, 1),
new ItemStack(ModItems.plate_iron, 2))
.setIconToFirstIngredient()); .setIconToFirstIngredient());
// ZIRNOX // ZIRNOX

View File

@ -25,6 +25,7 @@ import com.hbm.items.ModItems;
import com.hbm.items.food.ItemFlask.EnumInfusion; import com.hbm.items.food.ItemFlask.EnumInfusion;
import com.hbm.items.machine.ItemBatterySC.EnumBatterySC; import com.hbm.items.machine.ItemBatterySC.EnumBatterySC;
import com.hbm.items.machine.ItemCircuit.EnumCircuitType; import com.hbm.items.machine.ItemCircuit.EnumCircuitType;
import com.hbm.items.machine.ItemPileRodMK2.EnumPileRod;
import com.hbm.util.Tuple.Pair; import com.hbm.util.Tuple.Pair;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -846,30 +847,28 @@ public class AnvilRecipes extends SerializableRecipe {
).setTier(1)); ).setTier(1));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_uranium), new AnvilOutput[] { new ComparableStack(ModItems.billet_ra226be, 3), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.billet_uranium, 3)), new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RA226BE.ordinal())),
new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))
}).setTier(2)); }).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_source), new AnvilOutput[] { new ComparableStack(ModItems.billet_po210be, 3), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.billet_ra226be, 3)), new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PO210BE.ordinal())),
new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))
}).setTier(2)); }).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_boron), new AnvilOutput[] { new OreDictStack(ZR.billet(), 3), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.ingot_boron, 2)), new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.ZR.ordinal())),
new AnvilOutput(new ItemStack(Items.stick, 2))
}).setTier(2)); }).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_detector), new AnvilOutput[] { new OreDictStack(U.billet(), 3), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.ingot_boron, 2)), new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.NU.ordinal())),
new AnvilOutput(new ItemStack(ModItems.motor, 1)),
new AnvilOutput(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE))
}).setTier(2)); }).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_lithium), new AnvilOutput[] { new OreDictStack(PU239.billet(), 3), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.lithium, 1)), new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.PU239.ordinal())),
new AnvilOutput(new ItemStack(ModItems.cell_empty, 1)) }).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe(
new OreDictStack(PURG.billet(), 3), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.pile_rod, 1, EnumPileRod.RGP.ordinal())),
}).setTier(2)); }).setTier(2));
//RBMK //RBMK
@ -968,20 +967,6 @@ public class AnvilRecipes extends SerializableRecipe {
new AnvilOutput(new ItemStack(ModItems.circuit, 1, EnumCircuitType.BASIC.ordinal()), 0.5F), new AnvilOutput(new ItemStack(ModItems.circuit, 1, EnumCircuitType.BASIC.ordinal()), 0.5F),
}).setTier(4)); }).setTier(4));
} else {
constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_plutonium), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 2)),
new AnvilOutput(new ItemStack(ModItems.billet_nuclear_waste, 1)),
new AnvilOutput(new ItemStack(ModItems.plate_iron, 1))
}).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_pu239), new AnvilOutput[] {
new AnvilOutput(new ItemStack(ModItems.billet_pu239, 1)),
new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 1)),
new AnvilOutput(new ItemStack(ModItems.billet_nuclear_waste, 1)),
new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))
}).setTier(2));
} }
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(

View File

@ -92,6 +92,9 @@ public class NEIConfig implements IConfigureNEI {
API.hideItem(new ItemStack(ModBlocks.conveyor_double)); API.hideItem(new ItemStack(ModBlocks.conveyor_double));
API.hideItem(new ItemStack(ModBlocks.conveyor_triple)); API.hideItem(new ItemStack(ModBlocks.conveyor_triple));
API.hideItem(new ItemStack(ModBlocks.brick_forgotten));
API.hideItem(new ItemStack(ModBlocks.brick_forgotten_lock));
API.registerHighlightIdentifier(ModBlocks.plushie, new IHighlightHandler() { API.registerHighlightIdentifier(ModBlocks.plushie, new IHighlightHandler() {
@Override public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) { @Override public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop) {
int x = mop.blockX; int x = mop.blockX;

View File

@ -137,6 +137,7 @@ ass.nitra=Nitra zu Munition
autoswitch=Teil der Rezeptgruppe "%s"$Rezept ändert sich basierend auf das erste Item autoswitch=Teil der Rezeptgruppe "%s"$Rezept ändert sich basierend auf das erste Item
autoswitch.cyclotron=Zyklotron-Pulverkisten autoswitch.cyclotron=Zyklotron-Pulverkisten
autoswitch.pile=Wiederaufbereitung Chicago-Pile-Brennstoff autoswitch.pile=Wiederaufbereitung Chicago-Pile-Brennstoff
autoswitch.pilerod=Chicago-Pile-Brennstoff
autoswitch.plate=Wiederaufbereitung Plattenbrennstoff autoswitch.plate=Wiederaufbereitung Plattenbrennstoff
autoswitch.plates=Metallplatten autoswitch.plates=Metallplatten
autoswitch.pwr=Wiederaufbereitung PWR-Brennstoff autoswitch.pwr=Wiederaufbereitung PWR-Brennstoff
@ -3981,6 +3982,7 @@ tile.brick_dungeon_flat.name=Berzelianitblock
tile.brick_dungeon_tile.name=Berzelianitfliese tile.brick_dungeon_tile.name=Berzelianitfliese
tile.brick_fire.name=Schamottsteinziegel tile.brick_fire.name=Schamottsteinziegel
tile.brick_fire_stairs.name=Schamottsteintreppe tile.brick_fire_stairs.name=Schamottsteintreppe
tile.brick_forgotten.name=Block
tile.brick_jungle.name=Enargitziegel tile.brick_jungle.name=Enargitziegel
tile.brick_jungle_circle.name=Mechanistenzirkel tile.brick_jungle_circle.name=Mechanistenzirkel
tile.brick_jungle_cracked.name=Rissige Enargitziegel tile.brick_jungle_cracked.name=Rissige Enargitziegel

View File

@ -192,6 +192,7 @@ ass.nitra=Nitra to Ammunition
autoswitch=Part of auto switch group "%s"$Recipe changes based on first ingredient autoswitch=Part of auto switch group "%s"$Recipe changes based on first ingredient
autoswitch.cyclotron=Cyclotron Powder Boxes autoswitch.cyclotron=Cyclotron Powder Boxes
autoswitch.pile=Reprocessing Chicago Pile Rods autoswitch.pile=Reprocessing Chicago Pile Rods
autoswitch.pilerod=Chicago Pile Rods
autoswitch.plate=Reprocessing Plate Fuel autoswitch.plate=Reprocessing Plate Fuel
autoswitch.plates=Metal Plates autoswitch.plates=Metal Plates
autoswitch.pwr=Reprocessing PWR Fuel autoswitch.pwr=Reprocessing PWR Fuel
@ -5196,6 +5197,7 @@ tile.brick_dungeon_flat.name=Berzelianite Block
tile.brick_dungeon_tile.name=Berzelianite Tile tile.brick_dungeon_tile.name=Berzelianite Tile
tile.brick_fire.name=Firebricks tile.brick_fire.name=Firebricks
tile.brick_fire_stairs.name=Firebrick Stairs tile.brick_fire_stairs.name=Firebrick Stairs
tile.brick_forgotten.name=Block
tile.brick_jungle.name=Enargite Bricks tile.brick_jungle.name=Enargite Bricks
tile.brick_jungle_circle.name=Mechanist's Circle tile.brick_jungle_circle.name=Mechanist's Circle
tile.brick_jungle_cracked.name=Cracked Enargite Bricks tile.brick_jungle_cracked.name=Cracked Enargite Bricks

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 B