xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tier 3 bedrock processing, woooo

Browse Source
This commit is contained in:
Bob 2023-03-01 21:28:13 +01:00
parent fc531e1c60
commit 6a19508681
15 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -1,6 +1,6 @@
mod_version=1.0.27
# Empty build number makes a release type
mod_build_number=4522
mod_build_number=4525
credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\
\ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting),\

6
src/main/java/com/hbm/crafting/SmeltingRecipes.java
View File

@ -9,6 +9,7 @@ import com.hbm.items.ItemEnums.EnumCokeType;
import com.hbm.items.ItemEnums.EnumPlantType;
import com.hbm.items.machine.ItemBattery;
import com.hbm.items.special.ItemHot;
import com.hbm.items.special.ItemBedrockOre.EnumBedrockOre;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
@ -178,6 +179,11 @@ public class SmeltingRecipes {
GameRegistry.addSmelting(new ItemStack(ModItems.scrap_plastic, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ModItems.ingot_polymer), 0.1F);
for(EnumBedrockOre ore : EnumBedrockOre.values()) {
int i = ore.ordinal();
GameRegistry.addSmelting(new ItemStack(ModBlocks.ore_bedrock, 1, i), new ItemStack(Blocks.cobblestone, 16), 0.1F);
}
for(int i = 0; i < 10; i++)
GameRegistry.addSmelting(new ItemStack(ModItems.ingot_steel_dusted, 1, i), ItemHot.heatUp(new ItemStack(ModItems.ingot_steel_dusted, 1, i)), 1.0F);
}

32
src/main/java/com/hbm/inventory/fluid/tank/FluidLoaderInfinite.java
View File

@ -14,22 +14,6 @@ public class FluidLoaderInfinite extends FluidLoadingHandler {
@Override
public boolean fillItem(ItemStack[] slots, int in, int out, FluidTank tank) {
if(slots[in] == null || !(slots[in].getItem() instanceof ItemInfiniteFluid) || tank.getTankType() == Fluids.NONE) return false;
ItemInfiniteFluid item = (ItemInfiniteFluid) slots[in].getItem();
if(item.getType() != null && tank.type != item.getType()) return false;
if(item.getChance() <= 1 || rand.nextInt(item.getChance()) == 0) {
tank.setFill(Math.min(tank.getFill() + item.getAmount(), tank.getMaxFill()));
}
return true;
}
@Override
public boolean emptyItem(ItemStack[] slots, int in, int out, FluidTank tank) {
if(slots[in] == null || !(slots[in].getItem() instanceof ItemInfiniteFluid)) return false;
ItemInfiniteFluid item = (ItemInfiniteFluid) slots[in].getItem();
@ -42,4 +26,20 @@ public class FluidLoaderInfinite extends FluidLoadingHandler {
return true;
}
@Override
public boolean emptyItem(ItemStack[] slots, int in, int out, FluidTank tank) {
if(slots[in] == null || !(slots[in].getItem() instanceof ItemInfiniteFluid) || tank.getTankType() == Fluids.NONE) return false;
ItemInfiniteFluid item = (ItemInfiniteFluid) slots[in].getItem();
if(item.getType() != null && tank.type != item.getType()) return false;
if(item.getChance() <= 1 || rand.nextInt(item.getChance()) == 0) {
tank.setFill(Math.min(tank.getFill() + item.getAmount(), tank.getMaxFill()));
}
return true;
}
}

2
src/main/java/com/hbm/inventory/gui/GUIMachineCentrifuge.java
View File

@ -28,7 +28,7 @@ public class GUIMachineCentrifuge extends GuiInfoContainer {
public void drawScreen(int mouseX, int mouseY, float f) {
super.drawScreen(mouseX, mouseY, f);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 69 - 52, 16, 52, centrifuge.power, centrifuge.maxPower);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 9, guiTop + 13, 16, 34, centrifuge.power, centrifuge.maxPower);
}
@Override

8
src/main/java/com/hbm/inventory/recipes/CentrifugeRecipes.java
View File

@ -338,6 +338,14 @@ public class CentrifugeRecipes extends SerializableRecipe {
new ItemStack(ModItems.ore_enriched, 1, i),
ItemStackUtil.carefulCopy(by2),
ItemStackUtil.carefulCopy(by2) });
EnumByproduct tier3 = ore.byproducts[2];
ItemStack by3 = tier3 == null ? new ItemStack(ModItems.dust) : DictFrame.fromOne(ModItems.ore_byproduct, tier3, 1);
recipes.put(new ComparableStack(ModItems.ore_seared, 1, i), new ItemStack[] {
new ItemStack(ModItems.ore_enriched, 1, i),
new ItemStack(ModItems.ore_enriched, 1, i),
ItemStackUtil.carefulCopy(by3),
ItemStackUtil.carefulCopy(by3) });
}
List<ItemStack> quartz = OreDictionary.getOres("crystalCertusQuartz");

2
src/main/java/com/hbm/inventory/recipes/CrystallizerRecipes.java
View File

@ -100,6 +100,7 @@ public class CrystallizerRecipes {
FluidStack nitric = new FluidStack(Fluids.NITRIC_ACID, 500);
FluidStack organic = new FluidStack(Fluids.SOLVENT, 500);
FluidStack hiperf = new FluidStack(Fluids.RADIOSOLVENT, 500);
int oreTime = 200;
@ -110,6 +111,7 @@ public class CrystallizerRecipes {
registerRecipe(new ComparableStack(ModItems.ore_separated, 1, i), new CrystallizerRecipe(new ItemStack(ModItems.ore_purified, 1, i), oreTime), sulfur);
registerRecipe(new ComparableStack(ModItems.ore_separated, 1, i), new CrystallizerRecipe(new ItemStack(ModItems.ore_nitrated, 1, i), oreTime), nitric);
registerRecipe(new ComparableStack(ModItems.ore_nitrocrystalline, 1, i), new CrystallizerRecipe(new ItemStack(ModItems.ore_deepcleaned, 1, i), oreTime), organic);
registerRecipe(new ComparableStack(ModItems.ore_nitrocrystalline, 1, i), new CrystallizerRecipe(new ItemStack(ModItems.ore_seared, 1, i), oreTime), hiperf);
}
FluidStack woodOil = new FluidStack(Fluids.WOODOIL, 100);

4
src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java
View File

@ -221,6 +221,10 @@ public class ShredderRecipes extends SerializableRecipe {
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_cleaned, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_separated, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_purified, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_nitrated, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_nitrocrystalline, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_deepcleaned, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
ShredderRecipes.setRecipe(new ItemStack(ModItems.ore_seared, 1, i), new ItemStack(ModItems.ore_enriched, 1, i));
}
for(int i = 0; i < 5; i++) ShredderRecipes.setRecipe(new ItemStack(Items.skull, 1, i), new ItemStack(ModItems.biomass, 4));

6
src/main/java/com/hbm/items/ModItems.java
View File

@ -199,6 +199,8 @@ public class ModItems {
public static Item ore_nitrated;
public static Item ore_nitrocrystalline;
public static Item ore_deepcleaned;
public static Item ore_seared;
//public static Item ore_radcleaned;
public static Item ore_enriched; //final stage
public static Item billet_uranium;
@ -2847,6 +2849,8 @@ public class ModItems {
ore_nitrated = new ItemBedrockOre().setUnlocalizedName("ore_nitrated").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_nitrated");
ore_nitrocrystalline = new ItemBedrockOre().setUnlocalizedName("ore_nitrocrystalline").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_nitrocrystalline");
ore_deepcleaned = new ItemBedrockOre().setUnlocalizedName("ore_deepcleaned").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_deepcleaned");
ore_seared = new ItemBedrockOre().setUnlocalizedName("ore_seared").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_seared");
//ore_radcleaned = new ItemBedrockOre().setUnlocalizedName("ore_radcleaned").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_radcleaned");
ore_enriched = new ItemBedrockOre().setUnlocalizedName("ore_enriched").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_enriched");
ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lanthanium");
@ -6155,6 +6159,8 @@ public class ModItems {
GameRegistry.registerItem(ore_nitrated, ore_nitrated.getUnlocalizedName());
GameRegistry.registerItem(ore_nitrocrystalline, ore_nitrocrystalline.getUnlocalizedName());
GameRegistry.registerItem(ore_deepcleaned, ore_deepcleaned.getUnlocalizedName());
GameRegistry.registerItem(ore_seared, ore_seared.getUnlocalizedName());
//GameRegistry.registerItem(ore_radcleaned, ore_radcleaned.getUnlocalizedName());
GameRegistry.registerItem(ore_enriched, ore_enriched.getUnlocalizedName());
GameRegistry.registerItem(ore_byproduct, ore_byproduct.getUnlocalizedName());

10
src/main/java/com/hbm/items/special/ItemBedrockOre.java
View File

@ -64,7 +64,7 @@ public class ItemBedrockOre extends ItemEnumMulti {
/*
* BYPRODUCT TIER 1: NITRIC ACID - CHEMPLANT GATE / NO GATE
* BYPRODUCT TIER 2: ORGANIC SOLVENT - CRACKING OIL GATE
* BYPRODUCT TIER 3: ??? - RBMK GATE?
* BYPRODUCT TIER 3: HIPERF SOLVENT - RBMK GATE
* BYPRODUCT TIER 4: SCHRABIDIC ACID - FUSION GATE?
*/
@ -72,8 +72,12 @@ public class ItemBedrockOre extends ItemEnumMulti {
* [BEDROCK x1] -C-> [CENTRIFUGED x4] -(PER)-> [CLEANED x4] -C-> [SEPARATED x16] -(SUL)-> [PURIFIED x16] -C-> [ENRICHED x64]
* \
* \-------(NIT)-> [NITRATED x16] -C-> [NITROCRYSTALLINE x32] -(ORG)-> [DEEP-CLEANED x32] -C-> [ENRICHED x64]
* v v
* [BYPRODUCT TIER 1] [BYPRODUCT TIER 2]
* v \ v
* [BYPRODUCT TIER 1] \ [BYPRODUCT TIER 2]
* \
* \-----------(HPS)-> [SEARED x32] -C-> [ENRICHED x64]
* v
* [BYPRODUCT TIER 3]
*/
public static enum EnumBedrockOre {

2
src/main/java/com/hbm/lib/RefStrings.java
View File

@ -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 (4522)";
public static final String VERSION = "1.0.27 BETA (4525)";
//HBM's Beta Naming Convention:
//V T (X)
//V -> next release version

4
src/main/java/com/hbm/main/NEIConfig.java
View File

@ -27,10 +27,11 @@ public class NEIConfig implements IConfigureNEI {
@Override
public void loadConfig() {
registerHandler(new AlloyFurnaceRecipeHandler());
registerHandler(new ShredderRecipeHandler());
registerHandler(new PressRecipeHandler());
registerHandler(new CentrifugeRecipeHandler());
registerHandler(new GasCentrifugeRecipeHandler());
registerHandler(new BreederRecipeHandler());
registerHandler(new ShredderRecipeHandler());
registerHandler(new CMBFurnaceRecipeHandler());
registerHandler(new CyclotronRecipeHandler());
registerHandler(new AssemblerRecipeHandler());
@ -38,7 +39,6 @@ public class NEIConfig implements IConfigureNEI {
registerHandler(new BoilerRecipeHandler());
registerHandler(new ChemplantRecipeHandler());
registerHandler(new FluidRecipeHandler());
registerHandler(new PressRecipeHandler());
registerHandler(new CrystallizerRecipeHandler());
registerHandler(new BookRecipeHandler());
registerHandler(new FusionRecipeHandler());

2
src/main/resources/assets/hbm/lang/de_DE.lang
View File

@ -2429,6 +2429,8 @@ item.ore_enriched.name=Reiches %serz
item.ore_nitrated.name=Nitriertes %serz
item.ore_nitrocrystalline.name=Nitrokristallines %serz
item.ore_purified.name=Pures %serz
item.ore_radcleaaned.name=Strahlengereinigtes %serz
item.ore_seared.name=Geätztes %serz
item.ore_separated.name=Separiertes %serz
item.overfuse.name=Singularitätsschraubenzieher
item.oxy_mask.name=Sauerstoffmaske

2
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -3095,6 +3095,8 @@ item.ore_enriched.name=Enriched %s Ore
item.ore_nitrated.name=Nitrated %s Ore
item.ore_nitrocrystalline.name=Nitrocrystalline %s Ore
item.ore_purified.name=Purified %s Ore
item.ore_raadcleaned.name=Radiation-Cleaned %s Ore
item.ore_seared.name=Seared %s Ore
item.ore_separated.name=Separated %s Ore
item.overfuse.name=Singularity Screwdriver
item.overfuse.desc=Say what?

BIN
src/main/resources/assets/hbm/textures/items/ore_radcleaned.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 409 B

BIN
src/main/resources/assets/hbm/textures/items/ore_seared.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 444 B