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

RBMK fuels, funny smelling isotopes

Browse Source
This commit is contained in:
Bob 2021-04-11 21:15:21 +02:00
parent b7fcdee709
commit d8f58fd19e
12 changed files with 119 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/hbm/crafting/handlers/TestCraftingHandler.java Normal file
View File

@ -0,0 +1,56 @@
package com.hbm.crafting.handlers;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
public class TestCraftingHandler implements IRecipe {
ItemStack input;
ItemStack output;
public TestCraftingHandler(ItemStack input, ItemStack output) {
this.input = input;
this.output = output;
}
@Override
public boolean matches(InventoryCrafting inventory, World world) {
ItemStack inGrid = null;
for(int i = 0; i < 3; ++i) {
for(int j = 0; j < 3; ++j) {
ItemStack stack = inventory.getStackInRowAndColumn(j, i);
if(stack != null) {
if(inGrid == null)
inGrid = stack;
else
return false;
}
}
}
return inGrid != null && inGrid.getItem() == input.getItem() && inGrid.getItemDamage() == input.getItemDamage();
}
@Override
public int getRecipeSize() {
return 1;
}
@Override
public ItemStack getCraftingResult(InventoryCrafting inventory) {
return output.copy();
}
@Override
public ItemStack getRecipeOutput() {
return output;
}
}

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

@ -31,6 +31,7 @@ import net.minecraft.item.ItemSoup;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fluids.FluidContainerRegistry;
@ -65,6 +66,8 @@ public class ModItems {
public static Item ingot_pu_mix;
public static Item ingot_neptunium;
public static Item ingot_polonium;
public static Item ingot_co60;
public static Item ingot_au198;
public static Item ingot_titanium;
public static Item ingot_cobalt;
public static Item sulfur;
@ -116,6 +119,8 @@ public class ModItems {
public static Item ingot_daffergon;
public static Item ingot_verticium;
public static Item nugget_australium;
public static Item nugget_australium_lesser;
public static Item nugget_australium_greater;
public static Item nugget_weidanium;
public static Item nugget_reiium;
public static Item nugget_unobtainium;
@ -150,8 +155,13 @@ public class ModItems {
public static Item billet_pu_mix;
public static Item billet_neptunium;
public static Item billet_polonium;
public static Item billet_co60;
public static Item billet_au198;
public static Item billet_schrabidium;
public static Item billet_solinium;
public static Item billet_australium;
public static Item billet_australium_lesser;
public static Item billet_australium_greater;
public static Item billet_uranium_fuel;
public static Item billet_thorium_fuel;
public static Item billet_plutonium_fuel;
@ -171,6 +181,8 @@ public class ModItems {
public static Item nugget_pu_mix;
public static Item nugget_neptunium;
public static Item nugget_polonium;
public static Item nugget_co60;
public static Item nugget_au198;
public static Item plate_titanium;
public static Item plate_aluminium;
public static Item wire_red_copper;
@ -886,8 +898,12 @@ public class ModItems {
public static Item rbmk_fuel_les;
public static Item rbmk_fuel_mes;
public static Item rbmk_fuel_hes;
public static Item rbmk_fuel_leaus;
public static Item rbmk_fuel_heaus;
public static Item rbmk_fuel_po210be;
public static Item rbmk_fuel_pu238be;
public static Item rbmk_fuel_balefire;
public static Item rbmk_fuel_drx;
public static Item scrap;
public static Item trinitite;
@ -2256,6 +2272,8 @@ public class ModItems {
ingot_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.ingot).setUnlocalizedName("ingot_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_pu_mix");
ingot_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.ingot).setUnlocalizedName("ingot_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_neptunium");
ingot_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.ingot, true).setUnlocalizedName("ingot_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_polonium");
ingot_co60 = new ItemHazard().setUnlocalizedName("ingot_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_co60");
ingot_au198 = new ItemHazard().setUnlocalizedName("ingot_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_au198");
ingot_titanium = new Item().setUnlocalizedName("ingot_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_titanium");
ingot_cobalt = new Item().setUnlocalizedName("ingot_cobalt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_cobalt");
sulfur = new Item().setUnlocalizedName("sulfur").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sulfur");
@ -2332,8 +2350,13 @@ public class ModItems {
billet_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.billet).setUnlocalizedName("billet_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_pu_mix");
billet_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.billet).setUnlocalizedName("billet_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_neptunium");
billet_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.billet, true).setUnlocalizedName("billet_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_polonium");
billet_co60 = new ItemHazard().setUnlocalizedName("billet_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_co60");
billet_au198 = new ItemHazard().setUnlocalizedName("billet_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_au198");
billet_schrabidium = new ItemHazard(ItemHazard.sa326 * ItemHazard.billet, false, true).setUnlocalizedName("billet_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_schrabidium");
billet_solinium = new ItemHazard(ItemHazard.sa327 * ItemHazard.billet, false, true).setUnlocalizedName("billet_solinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_solinium");
billet_australium = new ItemHazard().setUnlocalizedName("billet_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium");
billet_australium_lesser = new ItemHazard().setUnlocalizedName("billet_australium_lesser").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium_lesser");
billet_australium_greater = new ItemHazard().setUnlocalizedName("billet_australium_greater").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_australium_greater");
billet_uranium_fuel = new ItemHazard(ItemHazard.uf * ItemHazard.billet).setUnlocalizedName("billet_uranium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_uranium_fuel");
billet_thorium_fuel = new ItemHazard(ItemHazard.thf * ItemHazard.billet).setUnlocalizedName("billet_thorium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_thorium_fuel");
billet_plutonium_fuel = new ItemHazard(ItemHazard.puf * ItemHazard.billet).setUnlocalizedName("billet_plutonium_fuel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_plutonium_fuel");
@ -2390,6 +2413,8 @@ public class ModItems {
ingot_daffergon = new ItemCustomLore().setUnlocalizedName("ingot_daffergon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_daffergon");
ingot_verticium = new ItemCustomLore().setUnlocalizedName("ingot_verticium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_verticium");
nugget_australium = new ItemCustomLore().setUnlocalizedName("nugget_australium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_australium");
nugget_australium_lesser = new ItemCustomLore().setUnlocalizedName("nugget_australium_lesser").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_australium_lesser");
nugget_australium_greater = new ItemCustomLore().setUnlocalizedName("nugget_australium_greater").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_australium_greater");
nugget_weidanium = new ItemCustomLore().setUnlocalizedName("nugget_weidanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_weidanium");
nugget_reiium = new ItemCustomLore().setUnlocalizedName("nugget_reiium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_reiium");
nugget_unobtainium = new ItemCustomLore().setUnlocalizedName("nugget_unobtainium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_unobtainium");
@ -2408,6 +2433,8 @@ public class ModItems {
nugget_pu_mix = new ItemHazard(ItemHazard.purg * ItemHazard.nugget).setUnlocalizedName("nugget_pu_mix").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_pu_mix");
nugget_neptunium = new ItemHazard(ItemHazard.np237 * ItemHazard.nugget).setUnlocalizedName("nugget_neptunium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_neptunium");
nugget_polonium = new ItemHazard(ItemHazard.po210 * ItemHazard.nugget, true).setUnlocalizedName("nugget_polonium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_polonium");
nugget_co60 = new ItemHazard().setUnlocalizedName("nugget_co60").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_co60");
nugget_au198 = new ItemHazard().setUnlocalizedName("nugget_au198").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_au198");
plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium");
plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_aluminium");
wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_red_copper");
@ -3107,12 +3134,25 @@ public class ModItems {
rbmk_fuel_hes = new ItemRBMKRod("Highly Enriched Schrabidium")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_hes").setTextureName(RefStrings.MODID + ":rbmk_fuel_hes");
rbmk_fuel_leaus = new ItemRBMKRod("Low Enriched Australium (Tasmanite)")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_leaus").setTextureName(RefStrings.MODID + ":rbmk_fuel_leaus");
rbmk_fuel_heaus = new ItemRBMKRod("Highly Enriched Australium (Ayerite)")
.setYield(100000000D)
.setStats(100).setUnlocalizedName("rbmk_fuel_heaus").setTextureName(RefStrings.MODID + ":rbmk_fuel_heaus");
rbmk_fuel_po210be = new ItemRBMKRod("Polonium-210 & Beryllium Neutron Source")
.setYield(100000000D)
.setStats(70, 50).setUnlocalizedName("rbmk_fuel_po210be").setTextureName(RefStrings.MODID + ":rbmk_fuel_po210be");
rbmk_fuel_pu238be = new ItemRBMKRod("Plutonium-238 & Beryllium Neutron Source")
.setYield(100000000D)
.setStats(60, 35).setUnlocalizedName("rbmk_fuel_pu238be").setTextureName(RefStrings.MODID + ":rbmk_fuel_pu238be");
rbmk_fuel_balefire = new ItemRBMKRod("Draconic Flames")
.setYield(100000000D)
.setStats(60, 35).setUnlocalizedName("rbmk_fuel_balefire").setTextureName(RefStrings.MODID + ":rbmk_fuel_balefire");
rbmk_fuel_drx = new ItemRBMKRod(EnumChatFormatting.OBFUSCATED + "can't you hear, can't you hear the thunder?")
.setYield(100000000D)
.setStats(60, 35)
.addDigamma(0.1F).toItem().setUnlocalizedName("rbmk_fuel_drx").setTextureName(RefStrings.MODID + ":rbmk_fuel_drx");
trinitite = new ItemHazard().addRadiation(ItemHazard.trn * ItemHazard.ingot).toItem().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new");
nuclear_waste_long = new ItemHazard(5F).setUnlocalizedName("nuclear_waste_long").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long");
@ -4771,6 +4811,8 @@ public class ModItems {
GameRegistry.registerItem(ingot_pu_mix, ingot_pu_mix.getUnlocalizedName());
GameRegistry.registerItem(ingot_neptunium, ingot_neptunium.getUnlocalizedName());
GameRegistry.registerItem(ingot_polonium, ingot_polonium.getUnlocalizedName());
GameRegistry.registerItem(ingot_co60, ingot_co60.getUnlocalizedName());
GameRegistry.registerItem(ingot_au198, ingot_au198.getUnlocalizedName());
GameRegistry.registerItem(ingot_titanium, ingot_titanium.getUnlocalizedName());
GameRegistry.registerItem(ingot_copper, ingot_copper.getUnlocalizedName());
GameRegistry.registerItem(ingot_red_copper, ingot_red_copper.getUnlocalizedName());
@ -4841,8 +4883,13 @@ public class ModItems {
GameRegistry.registerItem(billet_pu_mix, billet_pu_mix.getUnlocalizedName());
GameRegistry.registerItem(billet_neptunium, billet_neptunium.getUnlocalizedName());
GameRegistry.registerItem(billet_polonium, billet_polonium.getUnlocalizedName());
GameRegistry.registerItem(billet_co60, billet_co60.getUnlocalizedName());
GameRegistry.registerItem(billet_au198, billet_au198.getUnlocalizedName());
GameRegistry.registerItem(billet_schrabidium, billet_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(billet_solinium, billet_solinium.getUnlocalizedName());
GameRegistry.registerItem(billet_australium, billet_australium.getUnlocalizedName());
GameRegistry.registerItem(billet_australium_lesser, billet_australium_lesser.getUnlocalizedName());
GameRegistry.registerItem(billet_australium_greater, billet_australium_greater.getUnlocalizedName());
GameRegistry.registerItem(billet_uranium_fuel, billet_uranium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_thorium_fuel, billet_thorium_fuel.getUnlocalizedName());
GameRegistry.registerItem(billet_plutonium_fuel, billet_plutonium_fuel.getUnlocalizedName());
@ -4996,6 +5043,8 @@ public class ModItems {
GameRegistry.registerItem(nugget_pu_mix, nugget_pu_mix.getUnlocalizedName());
GameRegistry.registerItem(nugget_neptunium, nugget_neptunium.getUnlocalizedName());
GameRegistry.registerItem(nugget_polonium, nugget_polonium.getUnlocalizedName());
GameRegistry.registerItem(nugget_co60, nugget_co60.getUnlocalizedName());
GameRegistry.registerItem(nugget_au198, nugget_au198.getUnlocalizedName());
GameRegistry.registerItem(nugget_lead, nugget_lead.getUnlocalizedName());
GameRegistry.registerItem(nugget_beryllium, nugget_beryllium.getUnlocalizedName());
GameRegistry.registerItem(nugget_schrabidium, nugget_schrabidium.getUnlocalizedName());
@ -5009,6 +5058,8 @@ public class ModItems {
GameRegistry.registerItem(nugget_les, nugget_les.getUnlocalizedName());
GameRegistry.registerItem(nugget_zirconium, nugget_zirconium.getUnlocalizedName());
GameRegistry.registerItem(nugget_australium, nugget_australium.getUnlocalizedName());
GameRegistry.registerItem(nugget_australium_lesser, nugget_australium_lesser.getUnlocalizedName());
GameRegistry.registerItem(nugget_australium_greater, nugget_australium_greater.getUnlocalizedName());
GameRegistry.registerItem(nugget_weidanium, nugget_weidanium.getUnlocalizedName());
GameRegistry.registerItem(nugget_reiium, nugget_reiium.getUnlocalizedName());
GameRegistry.registerItem(nugget_unobtainium, nugget_unobtainium.getUnlocalizedName());
@ -5736,8 +5787,12 @@ public class ModItems {
GameRegistry.registerItem(rbmk_fuel_les, rbmk_fuel_les.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_mes, rbmk_fuel_mes.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_hes, rbmk_fuel_hes.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_leaus, rbmk_fuel_leaus.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_heaus, rbmk_fuel_heaus.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_po210be, rbmk_fuel_po210be.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_pu238be, rbmk_fuel_pu238be.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_balefire, rbmk_fuel_balefire.getUnlocalizedName());
GameRegistry.registerItem(rbmk_fuel_drx, rbmk_fuel_drx.getUnlocalizedName());
GameRegistry.registerItem(scrap, scrap.getUnlocalizedName());
GameRegistry.registerItem(waste_uranium_hot, waste_uranium_hot.getUnlocalizedName());

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

@ -12,6 +12,7 @@ import com.hbm.crafting.PowderRecipes;
import com.hbm.crafting.RodRecipes;
import com.hbm.crafting.ToolRecipes;
import com.hbm.crafting.WeaponRecipes;
import com.hbm.crafting.handlers.TestCraftingHandler;
import com.hbm.handler.FluidTypeHandler.FluidType;
import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemBattery;
@ -45,6 +46,9 @@ public class CraftingManager {
WeaponRecipes.register();
ConsumableRecipes.register();
PowderRecipes.register();
GameRegistry.addRecipe(new TestCraftingHandler(new ItemStack(ModItems.lignite), new ItemStack(ModItems.powder_coal, 3)));
}
public static void AddCraftingRec() {

2
src/main/java/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java
View File

@ -53,7 +53,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements
tank.loadTank(2, 3, slots);
tank.setType(0, 1, slots);
if(tank.getTankType().isAntimatter()) {
if(tank.getTankType().isAntimatter() && tank.getFill() > 0) {
worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true);
}

BIN
src/main/resources/assets/hbm/textures/blocks/armor_table_bottom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 307 B

BIN
src/main/resources/assets/hbm/textures/blocks/armor_table_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 334 B

BIN
src/main/resources/assets/hbm/textures/blocks/armor_table_top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 324 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 243 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 598 B

BIN
src/main/resources/assets/hbm/textures/items/rbmk_fuel_drx.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 1.3 KiB

3
src/main/resources/assets/hbm/textures/items/rbmk_fuel_drx.png.mcmeta Normal file
View File

@ -0,0 +1,3 @@
{
"animation": { }
}