mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
67 mango mustard kendrick still water dubai labubu chocolate tralalero
please someone euthanize me
This commit is contained in:
Boblet
parent
76e6e7852b
commit
c639be1429
14
changelog
14
changelog
@ -1,10 +1,10 @@
|
||||
## Changed
|
||||
* Updated russian localization
|
||||
* Changed the recipe change button on the mixer to be bright red with arrows on it (since the "C" looked too much like it meant "clear")
|
||||
* The refinery and the vacuum refinery now have working recipe configs
|
||||
* Recipe autogen for foundry casting now deprioritizes fragments, preventing them from being casted when nuggets of that material are available
|
||||
* For consistency with the crucible material, all tantalium *items* now go by "tantalum"
|
||||
|
||||
## Fixed
|
||||
* Fixed atomic clock precision assembler recipe not working
|
||||
* Fixed ICF parts using 528 mode templates in normal mode
|
||||
* Fixed arc furnace queue slots inserting too many items, causing the output to exceed max stack size
|
||||
* Fixed MHD turbines requiring a 528 blueprint in normal mode
|
||||
* The game will now crash when the default pool list has a 528 blueprint entry, preventing this from happening again
|
||||
* Configured recipes do not have this check, you can use 528 mode templates in normal mode if you really want for some reason
|
||||
* Fixed ancient misspelling of "ketamine" on the splash screens
|
||||
* Fixed tantalum fragments not using autogen correctly, becoming unusable
|
||||
* Fixed 528 mode cracking tower requiring rubber instead of plasic for the blueprint, rendering it unobtainable
|
||||
@ -1,6 +1,6 @@
|
||||
mod_version=1.0.27
|
||||
# Empty build number makes a release type
|
||||
mod_build_number=5545
|
||||
mod_build_number=5546
|
||||
|
||||
credits=HbMinecraft,\
|
||||
\ rodolphito (explosion algorithms),\
|
||||
|
||||
@ -107,7 +107,7 @@ public class Mats {
|
||||
public static final NTMMaterial MAT_LEAD = makeSmeltable(8200, PB, 0xA6A6B2, 0x03030F, 0x646470).setAutogen(FRAGMENT, NUGGET, WIRE, BOLT, DUST, PLATE, CASTPLATE, PIPE, BLOCK).m();
|
||||
public static final NTMMaterial MAT_BISMUTH = makeSmeltable(8300, BI, 0xB200FF, 0xB200FF, 0xB200FF).setAutogen(FRAGMENT, NUGGET, BILLET, DUST, BLOCK).m();
|
||||
public static final NTMMaterial MAT_ARSENIC = makeSmeltable(3300, AS, 0x6CBABA, 0x242525, 0x558080).setAutogen(NUGGET).m();
|
||||
public static final NTMMaterial MAT_TANTALIUM = makeSmeltable(7300, TA, 0xFFFFFF, 0x1D1D36, 0xA89B74).setAutogen(NUGGET, DUST, BLOCK).m();
|
||||
public static final NTMMaterial MAT_TANTALIUM = makeSmeltable(7300, TA, 0xFFFFFF, 0x1D1D36, 0xA89B74).setAutogen(FRAGMENT, NUGGET, DUST, BLOCK).m();
|
||||
public static final NTMMaterial MAT_NEODYMIUM = makeSmeltable(6000, ND, 0xE6E6B6, 0x1C1C00, 0x8F8F5F).setAutogen(FRAGMENT, NUGGET, DUSTTINY, INGOT, DUST, DENSEWIRE, BLOCK).m();
|
||||
public static final NTMMaterial MAT_NIOBIUM = makeSmeltable(4100, NB, 0xB76EC9, 0x2F2D42, 0xD576B1).setAutogen(FRAGMENT, NUGGET, DUSTTINY, DUST, DENSEWIRE, BLOCK).m();
|
||||
public static final NTMMaterial MAT_BERYLLIUM = makeSmeltable(400, BE, 0xB2B2A6, 0x0F0F03, 0xAE9572).setAutogen(FRAGMENT, NUGGET, DUST, BLOCK).m();
|
||||
|
||||
@ -56,11 +56,6 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
@Override
|
||||
public void registerDefaults() {
|
||||
boolean no528 = !GeneralConfig.enable528;
|
||||
|
||||
// NBTStack test
|
||||
// this.register(new GenericRecipe("demo1").setup(20, 100).outputItems(BrokenItem.make(ModItems.plate_iron)).inputItems(new OreDictStack(IRON.ingot())));
|
||||
// this.register(new GenericRecipe("demo2").setup(20, 100).outputItems(BrokenItem.make(ModItems.plate_gold)).inputItems(new OreDictStack(IRON.ingot())));
|
||||
// this.register(new GenericRecipe("demo3").setup(20, 100).outputItems(new ItemStack(Items.iron_ingot)).inputItems(new NBTStack(BrokenItem.make(ModItems.plate_iron))));
|
||||
|
||||
// plates and ingots
|
||||
String autoPlate = "autoswitch.plates";
|
||||
@ -216,10 +211,6 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
.inputItems(new ComparableStack(ModItems.cap_fritz, 64), new ComparableStack(ModItems.cap_fritz, 64)));
|
||||
this.register(new GenericRecipe("ass.capkorl").setup(10, 100).outputItems(DictFrame.fromOne(ModBlocks.block_cap, EnumCapBlock.KORL))
|
||||
.inputItems(new ComparableStack(ModItems.cap_korl, 64), new ComparableStack(ModItems.cap_korl, 64)));
|
||||
/*
|
||||
this.register(new GenericRecipe("ass.").setup(, 100).outputItems(new ItemStack(ModBlocks., 1))
|
||||
.inputItems());
|
||||
*/
|
||||
|
||||
// machines
|
||||
this.register(new GenericRecipe("ass.shredder").setup(100, 100).outputItems(new ItemStack(ModBlocks.machine_shredder, 1))
|
||||
@ -276,7 +267,7 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
this.register(new GenericRecipe("ass.crackingtower").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_catalytic_cracker, 1))
|
||||
.inputItems(new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(STEEL.shell(), 6), new OreDictStack(DESH.ingot(), 12), new OreDictStack(NB.ingot(), 4))
|
||||
.inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 8, EnumExpensiveType.STEEL_PLATING), new OreDictStack(ANY_PLASTIC.ingot(), 16), new OreDictStack(NB.ingot(), 4))
|
||||
.setPools528(GenericRecipes.POOL_PREFIX_528 + "rubber"));
|
||||
.setPools528(GenericRecipes.POOL_PREFIX_528 + "plastic"));
|
||||
this.register(new GenericRecipe("ass.radiolysis").setup(200, 100).outputItems(new ItemStack(ModBlocks.machine_radiolysis, 1))
|
||||
.inputItems(new OreDictStack(STEEL.shell(), 4), new OreDictStack(ANY_RESISTANTALLOY.ingot(), 4), new OreDictStack(PB.plate(), 12), new OreDictStack(CU.plateCast(), 4), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModItems.thermo_element, 8))
|
||||
.inputItemsEx(new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.HEAVY_FRAME), new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.LEAD_PLATING), new OreDictStack(CU.plateCast(), 4), new OreDictStack(RUBBER.ingot(), 16), new ComparableStack(ModItems.thermo_element, 8)));
|
||||
@ -579,7 +570,7 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
this.register(new GenericRecipe("ass.fusionmhdt").setup(1_200, 100).outputItems(new ItemStack(ModBlocks.fusion_mhdt, 1))
|
||||
.inputItems(new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 16), new OreDictStack(CU.plateWelded(), 64), new OreDictStack(ANY_BISMOIDBRONZE.plateCast(), 16), new OreDictStack(SBD.wireDense(), 64), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.QUANTUM))
|
||||
.inputItemsEx(new ComparableStack(ModItems.item_expensive, 16, EnumExpensiveType.FERRO_PLATING), new ComparableStack(ModItems.item_expensive, 16, EnumExpensiveType.PLASTIC), new OreDictStack(ANY_BISMOIDBRONZE.plateCast(), 32), new ComparableStack(ModItems.circuit, 8, EnumCircuitType.QUANTUM))
|
||||
.setPools(GenericRecipes.POOL_PREFIX_528 + "chlorophyte"));
|
||||
.setPools528(GenericRecipes.POOL_PREFIX_528 + "chlorophyte"));
|
||||
this.register(new GenericRecipe("ass.fusioncoupler").setup(300, 100).outputItems(new ItemStack(ModBlocks.fusion_coupler, 1))
|
||||
.inputItems(new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 4), new OreDictStack(CU.plate(), 32), new OreDictStack(BSCCO.wireDense(), 16), new ComparableStack(ModItems.circuit, 4, EnumCircuitType.BISMOID))
|
||||
.inputItemsEx(new ComparableStack(ModItems.item_expensive, 4, EnumExpensiveType.FERRO_PLATING), new OreDictStack(BSCCO.wireDense(), 16), new ComparableStack(ModItems.item_expensive, 2, EnumExpensiveType.COMPUTER)));
|
||||
@ -656,10 +647,6 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
this.register(new GenericRecipe("ass.overdrive3").setup(1_200, 100).outputItems(new ItemStack(ModItems.upgrade_overdrive_3, 1))
|
||||
.inputItems(new ComparableStack(ModItems.upgrade_overdrive_2, 1), new ComparableStack(ModItems.upgrade_speed_3, 1), new ComparableStack(ModItems.upgrade_effect_3, 1), new OreDictStack(ANY_BISMOIDBRONZE.ingot(), 16), new ComparableStack(ModItems.ingot_cft, 16), new ComparableStack(ModItems.circuit, 16, EnumCircuitType.BISMOID)));
|
||||
}
|
||||
/*
|
||||
this.register(new GenericRecipe("ass.").setup(, 100).outputItems(new ItemStack(ModBlocks., 1))
|
||||
.inputItems());
|
||||
*/
|
||||
|
||||
// rancid shit mob spawners
|
||||
this.register(new GenericRecipe("ass.chopper").setup(1_200, 100).outputItems(new ItemStack(ModItems.spawn_chopper, 8))
|
||||
@ -785,11 +772,6 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
this.register(new GenericRecipe("ass.bholegrenade").setup(1_200, 100).outputItems(new ItemStack(ModItems.grenade_black_hole, 1))
|
||||
.inputItems(new OreDictStack(ANY_PLASTIC.ingot(), 6), new OreDictStack(OreDictManager.getReflector(), 3), new ComparableStack(ModItems.coil_magnetized_tungsten, 2), new ComparableStack(ModItems.black_hole, 1)));
|
||||
|
||||
/*
|
||||
this.register(new GenericRecipe("ass.").setup(, 100).outputItems(new ItemStack(ModBlocks., 1))
|
||||
.inputItems());
|
||||
*/
|
||||
|
||||
// turrets
|
||||
this.register(new GenericRecipe("ass.turretchekhov").setup(200, 100).outputItems(new ItemStack(ModBlocks.turret_chekhov, 1))
|
||||
.inputItems(new ComparableStack(ModBlocks.machine_battery, 1), new OreDictStack(STEEL.ingot(), 16), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED), new OreDictStack(STEEL.pipe(), 3), new OreDictStack(GUNMETAL.mechanism(), 3), new ComparableStack(ModBlocks.crate_iron, 1), new ComparableStack(ModItems.crt_display, 1))
|
||||
@ -986,11 +968,6 @@ public class AssemblyMachineRecipes extends GenericRecipes<GenericRecipe> {
|
||||
.inputItems(new ComparableStack(ModItems.seg_15, 1), new OreDictStack(WEAPONSTEEL.plate(), 32), new OreDictStack(OreDictManager.getReflector(), 16), new ComparableStack(ModItems.powder_magic, 8), new ComparableStack(ModItems.egg_balefire_shard, 4), new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 16), new ComparableStack(ModItems.circuit, 2, EnumCircuitType.CONTROLLER))
|
||||
.setPools528(GenericRecipes.POOL_PREFIX_528 + "controller"));
|
||||
|
||||
/*
|
||||
this.register(new GenericRecipe("ass.").setup(, 100).outputItems(new ItemStack(ModItems., 1))
|
||||
.inputItems());
|
||||
*/
|
||||
|
||||
// weapons
|
||||
this.register(new GenericRecipe("ass.schrabhammer").setup(6_000, 100).outputItems(new ItemStack(ModItems.schrabidium_hammer, 1))
|
||||
.inputItems(
|
||||
|
||||
@ -59,7 +59,17 @@ public class GenericRecipe {
|
||||
public GenericRecipe setIcon(Item item) { return this.setIcon(new ItemStack(item)); }
|
||||
public GenericRecipe setIcon(Block block) { return this.setIcon(new ItemStack(block)); }
|
||||
public GenericRecipe setNamed() { this.customLocalization = true; return this; }
|
||||
public GenericRecipe setPools(String... pools) { this.blueprintPools = pools; for(String pool : pools) GenericRecipes.addToPool(pool, this); return this; }
|
||||
|
||||
public GenericRecipe setPools(String... pools) {
|
||||
this.blueprintPools = pools;
|
||||
for(String pool : pools) {
|
||||
if(pool.startsWith(GenericRecipes.POOL_PREFIX_528)) throw new IllegalArgumentException("Tried initializing a recipe's default blueprint pool with a 528 blueprint - this is not allowed.");
|
||||
GenericRecipes.addToPool(pool, this);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
/** Only for recipe configs - same as regular except the anti 528 check doesn't exist */
|
||||
public GenericRecipe setPoolsAllow528(String... pools) { this.blueprintPools = pools; for(String pool : pools) GenericRecipes.addToPool(pool, this); return this; }
|
||||
public GenericRecipe setPools528(String... pools) { if(GeneralConfig.enable528) { this.blueprintPools = pools; for(String pool : pools) GenericRecipes.addToPool(pool, this); } return this; }
|
||||
public GenericRecipe setGroup(String autoSwitch, GenericRecipes set) { this.autoSwitchGroup = autoSwitch; set.addToGroup(autoSwitch, this); return this; }
|
||||
|
||||
|
||||
@ -118,7 +118,7 @@ public abstract class GenericRecipes<T extends GenericRecipe> extends Serializab
|
||||
|
||||
if(obj.has("icon")) recipe.setIcon(this.readItemStack(obj.get("icon").getAsJsonArray()));
|
||||
if(obj.has("named") && obj.get("named").getAsBoolean()) recipe.setNamed();
|
||||
if(obj.has("blueprintpool")) recipe.setPools(obj.get("blueprintpool").getAsString().split(":"));
|
||||
if(obj.has("blueprintpool")) recipe.setPoolsAllow528(obj.get("blueprintpool").getAsString().split(":"));
|
||||
if(obj.has("nameWrapper")) recipe.setNameWrapper(obj.get("nameWrapper").getAsString());
|
||||
if(obj.has("autoSwitchGroup")) recipe.setGroup(obj.get("autoSwitchGroup").getAsString(), this);
|
||||
|
||||
|
||||
@ -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 (5545)";
|
||||
public static final String VERSION = "1.0.27 BETA (5546)";
|
||||
//HBM's Beta Naming Convention:
|
||||
//V T (X)
|
||||
//V -> next release version
|
||||
|
||||
@ -1408,7 +1408,7 @@ public class ModEventHandlerClient {
|
||||
case 2: main.splashText = "All answers are popbob!"; break;
|
||||
case 3: main.splashText = "None may enter The Orb!"; break;
|
||||
case 4: main.splashText = "Wacarb was here"; break;
|
||||
case 5: main.splashText = "SpongeBoy me Bob I am overdosing on keramine agagagagaga"; break;
|
||||
case 5: main.splashText = "SpongeBoy me Bob I am overdosing on ketamine agagagagaga"; break;
|
||||
case 6: main.splashText = EnumChatFormatting.RED + "I know where you live, " + System.getProperty("user.name"); break;
|
||||
case 7: main.splashText = "Nice toes, now hand them over."; break;
|
||||
case 8: main.splashText = "I smell burnt toast!"; break;
|
||||
|
||||
@ -615,7 +615,7 @@ chem.CIRCUIT_5=High Performance Circuit Production
|
||||
chem.CO2=Carbon Dioxide Production
|
||||
chem.COALGAS_LEADED=Leaded Coal Gasoline Mixing
|
||||
chem.COLTAN_CLEANING=Coltan Purifying
|
||||
chem.COLTAN_CRYSTAL=Tantalium Crystallizing
|
||||
chem.COLTAN_CRYSTAL=Tantalum Crystallizing
|
||||
chem.COLTAN_PAIN=Pandemonium(III)tantalite Production
|
||||
chem.CONCRETE=Concrete Production
|
||||
chem.CONCRETE_ASBESTOS=Asbestos Concrete Production
|
||||
@ -2474,7 +2474,7 @@ item.circuit.basic.name=Integrated Circuit Board
|
||||
item.circuit.bismoid.name=Versatile Circuit Board
|
||||
item.circuit.capacitor.name=Capacitor
|
||||
item.circuit.capacitor_board.name=Capacitor Board
|
||||
item.circuit.capacitor_tantalium.name=Tantalium Capacitor
|
||||
item.circuit.capacitor_tantalium.name=Tantalum Capacitor
|
||||
item.circuit.chip.name=Microchip
|
||||
item.circuit.chip_bismoid.name=Versatile Integrated Circuit
|
||||
item.circuit.chip_quantum.name=Solid State Quantum Processor
|
||||
@ -2916,7 +2916,7 @@ item.geiger_counter.name=Handheld Geiger Counter
|
||||
item.gem_alexandrite.name=Alexandrite
|
||||
item.gem_rad.name=Radioactive Gem
|
||||
item.gem_sodalite.name=Sodalite
|
||||
item.gem_tantalium.name=Tantalium Polycrystal
|
||||
item.gem_tantalium.name=Tantalum Polycrystal
|
||||
item.gem_tantalium.desc='Tantalum'
|
||||
item.gem_tantalium.desc.P11=AKA Tantalum.
|
||||
item.gem_volcanic.name=Volcanic Gem
|
||||
@ -3216,7 +3216,7 @@ item.ingot_sr90.name=Strontium-90 Ingot
|
||||
item.ingot_starmetal.name=§9Starmetal Ingot§r
|
||||
item.ingot_steel.name=Steel Ingot
|
||||
item.ingot_steel_dusted.name=Dusted Steel Ingot
|
||||
item.ingot_tantalium.name=Tantalium Ingot
|
||||
item.ingot_tantalium.name=Tantalum Ingot
|
||||
item.ingot_tantalium.desc='Tantalum'
|
||||
item.ingot_tantalium.desc.P11=AKA Tantalum.
|
||||
item.ingot_tcalloy.name=Technetium Steel Ingot
|
||||
@ -3688,9 +3688,7 @@ item.nugget_schrabidium_fuel.name=Nugget of Schrabidium Fuel
|
||||
item.nugget_silicon.name=Silicon Nugget
|
||||
item.nugget_solinium.name=Solinium Nugget
|
||||
item.nugget_sr90.name=Strontium-90 Nugget
|
||||
item.nugget_tantalium.name=Tantalium Nugget
|
||||
item.nugget_tantalium.desc='Tantalum'
|
||||
item.nugget_tantalium.desc.P11=AKA Tantalum.
|
||||
item.nugget_tantalium.name=Tantalum Nugget
|
||||
item.nugget_technetium.name=Technetium-99 Nugget
|
||||
item.nugget_th232.name=Thorium-232 Nugget
|
||||
item.nugget_thorium_fuel.name=Nugget of Thorium Fuel
|
||||
@ -4067,7 +4065,7 @@ item.powder_sr90_tiny.name=Tiny Pile of Strontium-90 Powder
|
||||
item.powder_steel.name=Steel Powder
|
||||
item.powder_steel_tiny.name=Tiny Pile of Steel Powder
|
||||
item.powder_strontium.name=Strontium Powder
|
||||
item.powder_tantalium.name=Tantalium Powder
|
||||
item.powder_tantalium.name=Tantalum Powder
|
||||
item.powder_tantalium.desc='Tantalum'
|
||||
item.powder_tantalium.desc.P11=AKA Tantalum.
|
||||
item.powder_tcalloy.name=Technetium Steel Powder
|
||||
@ -5185,7 +5183,7 @@ tile.block_solinium.name=Block of Solinium
|
||||
tile.block_starmetal.name=§9Block of Starmetal§r
|
||||
tile.block_steel.name=Block of Steel
|
||||
tile.block_sulfur.name=Block of Sulfur
|
||||
tile.block_tantalium.name=Block of Tantalium
|
||||
tile.block_tantalium.name=Block of Tantalum
|
||||
tile.block_tcalloy.name=Block of Technetium Steel
|
||||
tile.block_thorium.name=Block of Thorium-232
|
||||
tile.block_thorium_fuel.name=Block of Thorium Fuel
|
||||
@ -5267,7 +5265,7 @@ tile.capacitor_copper.name=Copper Capacitor
|
||||
tile.capacitor_gold.name=Golden Capacitor
|
||||
tile.capacitor_niobium.name=Niobium Capacitor
|
||||
tile.capacitor_schrabidate.name=Schrabidate Capacitor
|
||||
tile.capacitor_tantalium.name=Tantalium Capacitor
|
||||
tile.capacitor_tantalium.name=Tantalum Capacitor
|
||||
tile.capacitor.desc=Input: Top$Output: Bottom, via Capacitor Bus
|
||||
tile.charge_c4.name=Demolition Charge
|
||||
tile.charge_dynamite.name=Time Bomb
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user