mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
fixes, oredict and all that
This commit is contained in:
Bob
parent
9932b377b3
commit
be4183efc8
@ -112,8 +112,8 @@ public class ConsumableRecipes {
|
||||
//Medicine
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.pill_iodine, 8), new Object[] { "IF", 'I', ModItems.powder_iodine, 'F', ModItems.fluorite });
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.plan_c, 1), new Object[] { "PFP", 'P', ModItems.powder_poison, 'F', ModItems.fluorite });
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.radx, 1), new Object[] { "P", "F", 'P', ModItems.powder_coal, 'F', ModItems.fluorite });
|
||||
GameRegistry.addRecipe(new ItemStack(ModItems.siox, 8), new Object[] { "PNF", 'P', ModItems.powder_coal, 'F', ModItems.powder_asbestos, 'N', ModItems.nugget_bismuth });
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.radx, 1), new Object[] { "dustCoal", "dustFluorite", "dustFluorite" }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.siox, 8), new Object[] { "dustCoal", "dustAsbestos", ModItems.nugget_bismuth }));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.xanax, 1), new Object[] { ModItems.powder_coal, ModItems.niter, ModItems.powder_bromine });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fmn, 1), new Object[] { ModItems.powder_coal, ModItems.powder_polonium, ModItems.powder_strontium });
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.five_htp, 1), new Object[] { ModItems.powder_coal, ModItems.powder_euphemium, ModItems.canteen_fab });
|
||||
|
||||
@ -134,7 +134,7 @@ public class MineralRecipes {
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 3), new Object[] { ModItems.billet_schrabidium, ModItems.billet_neptunium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium });
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "nuggetNeptunium237", "nuggetNeptunium237", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_schrabidium_fuel, 1), new Object[] { ModItems.nugget_schrabidium, ModItems.nugget_schrabidium, "tinyNp237", "tinyNp237", ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 1), new Object[] { "nuggetPolonium", "nuggetPolonium", "nuggetPolonium", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_po210be, 1), new Object[] { "nuggetPolonium210", "nuggetPolonium210", "nuggetPolonium210", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_pu238be, 1), new Object[] { "nuggetPlutonium238", "nuggetPlutonium238", "nuggetPlutonium238", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_ra226be, 1), new Object[] { "nuggetRadium226", "nuggetRadium226", "nuggetRadium226", ModItems.nugget_beryllium, ModItems.nugget_beryllium, ModItems.nugget_beryllium }));
|
||||
|
||||
|
||||
@ -173,9 +173,9 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler {
|
||||
@Override
|
||||
public void handleWorldDestruction() {
|
||||
|
||||
int count = 25;
|
||||
int count = 10;
|
||||
int threshold = 10;
|
||||
int chunks = 2;
|
||||
int chunks = 5;
|
||||
|
||||
//for all worlds
|
||||
for(Entry<World, SimpleRadiationPerWorld> per : perWorld.entrySet()) {
|
||||
@ -186,7 +186,7 @@ public class ChunkRadiationHandlerSimple extends ChunkRadiationHandler {
|
||||
Object[] entries = list.radiation.entrySet().toArray();
|
||||
|
||||
if(entries.length == 0)
|
||||
return;
|
||||
continue;
|
||||
|
||||
//chose this many random chunks
|
||||
for(int c = 0; c < chunks; c++) {
|
||||
|
||||
@ -1,7 +1,18 @@
|
||||
package com.hbm.hazard;
|
||||
|
||||
import static com.hbm.blocks.ModBlocks.*;
|
||||
import static com.hbm.items.ModItems.*;
|
||||
|
||||
import com.hbm.hazard.transformer.HazardTransformerRadiationNBT;
|
||||
import com.hbm.hazard.type.*;
|
||||
import com.hbm.items.special.ItemHazard;
|
||||
import com.hbm.items.special.ItemWasteLong;
|
||||
import com.hbm.items.special.ItemWasteShort;
|
||||
import com.hbm.lib.RefStrings;
|
||||
import com.hbm.main.MainRegistry;
|
||||
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
|
||||
public class HazardRegistry {
|
||||
|
||||
@ -98,8 +109,88 @@ public class HazardRegistry {
|
||||
public static final HazardTypeBase EXPLOSIVE = new HazardTypeExplosive();
|
||||
|
||||
public static void registerItems() {
|
||||
//HazardSystem.register("ingotPlutonium", makeData(RADIATION, pu * ingot));
|
||||
//TODO: move all the itemhazard stuff here
|
||||
|
||||
HazardSystem.register(Items.gunpowder, makeData(EXPLOSIVE, 1F));
|
||||
HazardSystem.register(Blocks.tnt, makeData(EXPLOSIVE, 4F));
|
||||
HazardSystem.register(Items.pumpkin_pie, makeData(EXPLOSIVE, 4F));
|
||||
|
||||
HazardSystem.register("dustCoal", makeData(COAL, powder));
|
||||
HazardSystem.register("dustSmallCoal", makeData(COAL, powder_tiny));
|
||||
HazardSystem.register("dustLignite", makeData(COAL, powder));
|
||||
HazardSystem.register("dustSmallLignite", makeData(COAL, powder_tiny));
|
||||
|
||||
HazardSystem.register(ingot_semtex, makeData(EXPLOSIVE, 10F));
|
||||
HazardSystem.register(block_semtex, makeData(EXPLOSIVE, 40F));
|
||||
|
||||
HazardSystem.register(trinitite, makeData(RADIATION, trn * ingot));
|
||||
HazardSystem.register(nuclear_waste_long, makeData(RADIATION, 5F));
|
||||
HazardSystem.register(nuclear_waste_long_tiny, makeData(RADIATION, 0.5F));
|
||||
HazardSystem.register(nuclear_waste_short, new HazardData().addEntry(RADIATION, 30F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(nuclear_waste_short_tiny, new HazardData().addEntry(RADIATION, 3F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(nuclear_waste_long_depleted, makeData(RADIATION, 0.5F));
|
||||
HazardSystem.register(nuclear_waste_long_depleted_tiny, makeData(RADIATION, 0.05F));
|
||||
HazardSystem.register(nuclear_waste_short_depleted, makeData(RADIATION, 3F));
|
||||
HazardSystem.register(nuclear_waste_short_depleted_tiny, makeData(RADIATION, 0.3F));
|
||||
HazardSystem.register(nuclear_waste, makeData(RADIATION, 15F));
|
||||
HazardSystem.register(nuclear_waste_tiny, makeData(RADIATION, 1.5F));
|
||||
HazardSystem.register(nuclear_waste_vitrified, makeData(RADIATION, 7.5F));
|
||||
HazardSystem.register(nuclear_waste_vitrified_tiny, makeData(RADIATION, 0.75F));
|
||||
HazardSystem.register(waste_uranium, makeData(RADIATION, 15F));
|
||||
HazardSystem.register(waste_thorium, makeData(RADIATION, 10F));
|
||||
HazardSystem.register(waste_plutonium, makeData(RADIATION, 15F));
|
||||
HazardSystem.register(waste_mox, makeData(RADIATION, 15F));
|
||||
HazardSystem.register(waste_schrabidium, new HazardData().addEntry(RADIATION, 15F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(waste_uranium_hot, new HazardData().addEntry(RADIATION, 10F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(waste_thorium_hot, new HazardData().addEntry(RADIATION, 15F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(waste_plutonium_hot, new HazardData().addEntry(RADIATION, 15F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(waste_mox_hot, new HazardData().addEntry(RADIATION, 15F).addEntry(HOT, 5F));
|
||||
HazardSystem.register(waste_schrabidium_hot, new HazardData().addEntry(RADIATION, 40F).addEntry(HOT, 5F).addEntry(BLINDING, 5F));
|
||||
|
||||
HazardSystem.register(nugget_uranium_fuel, makeData(RADIATION, uf * nugget));
|
||||
HazardSystem.register(billet_uranium_fuel, makeData(RADIATION, uf * billet));
|
||||
HazardSystem.register(ingot_uranium_fuel, makeData(RADIATION, uf * ingot));
|
||||
HazardSystem.register(block_uranium_fuel, makeData(RADIATION, uf * block));
|
||||
|
||||
HazardSystem.register(nugget_plutonium_fuel, makeData(RADIATION, puf * nugget));
|
||||
HazardSystem.register(billet_plutonium_fuel, makeData(RADIATION, puf * billet));
|
||||
HazardSystem.register(ingot_plutonium_fuel, makeData(RADIATION, puf * ingot));
|
||||
HazardSystem.register(block_plutonium_fuel, makeData(RADIATION, puf * block));
|
||||
|
||||
HazardSystem.register(nugget_thorium_fuel, makeData(RADIATION, thf * nugget));
|
||||
HazardSystem.register(billet_thorium_fuel, makeData(RADIATION, thf * billet));
|
||||
HazardSystem.register(ingot_thorium_fuel, makeData(RADIATION, thf * ingot));
|
||||
HazardSystem.register(block_thorium_fuel, makeData(RADIATION, thf * block));
|
||||
|
||||
HazardSystem.register(nugget_neptunium_fuel, makeData(RADIATION, npf * nugget));
|
||||
HazardSystem.register(billet_neptunium_fuel, makeData(RADIATION, npf * billet));
|
||||
HazardSystem.register(ingot_neptunium_fuel, makeData(RADIATION, npf * ingot));
|
||||
|
||||
HazardSystem.register(nugget_mox_fuel, makeData(RADIATION, mox * nugget));
|
||||
HazardSystem.register(billet_mox_fuel, makeData(RADIATION, mox * billet));
|
||||
HazardSystem.register(ingot_mox_fuel, makeData(RADIATION, mox * ingot));
|
||||
HazardSystem.register(block_mox_fuel, makeData(RADIATION, mox * block));
|
||||
|
||||
HazardSystem.register(nugget_americium_fuel, makeData(RADIATION, amf * nugget));
|
||||
HazardSystem.register(billet_americium_fuel, makeData(RADIATION, amf * billet));
|
||||
HazardSystem.register(ingot_americium_fuel, makeData(RADIATION, amf * ingot));
|
||||
|
||||
HazardSystem.register(nugget_schrabidium_fuel, makeData(RADIATION, saf * nugget));
|
||||
HazardSystem.register(billet_schrabidium_fuel, makeData(RADIATION, saf * billet));
|
||||
HazardSystem.register(ingot_schrabidium_fuel, makeData(RADIATION, saf * ingot));
|
||||
HazardSystem.register(block_schrabidium_fuel, makeData(RADIATION, saf * block));
|
||||
|
||||
HazardSystem.register(nugget_hes, makeData(RADIATION, saf * nugget));
|
||||
HazardSystem.register(billet_hes, makeData(RADIATION, saf * billet));
|
||||
HazardSystem.register(ingot_hes, makeData(RADIATION, saf * ingot));
|
||||
|
||||
HazardSystem.register(nugget_les, makeData(RADIATION, saf * nugget));
|
||||
HazardSystem.register(billet_les, makeData(RADIATION, saf * billet));
|
||||
HazardSystem.register(ingot_les, makeData(RADIATION, saf * ingot));
|
||||
|
||||
HazardSystem.register(billet_balefire_gold, makeData(RADIATION, au198 * billet));
|
||||
HazardSystem.register(billet_po210be, makeData(RADIATION, pobe * billet));
|
||||
HazardSystem.register(billet_ra226be, makeData(RADIATION, rabe * billet));
|
||||
HazardSystem.register(billet_pu238be, makeData(RADIATION, pube * billet));
|
||||
|
||||
//TODO: move this into its own method
|
||||
HazardSystem.trafos.add(new HazardTransformerRadiationNBT());
|
||||
|
||||
@ -11,11 +11,12 @@ import com.hbm.inventory.RecipesCommon.ComparableStack;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import scala.xml.PrettyPrinter.Item;
|
||||
|
||||
@Untested
|
||||
public class HazardSystem {
|
||||
@ -52,6 +53,8 @@ public class HazardSystem {
|
||||
oreMap.put((String)o, data);
|
||||
if(o instanceof Item)
|
||||
itemMap.put((Item)o, data);
|
||||
if(o instanceof Block)
|
||||
itemMap.put(Item.getItemFromBlock((Block)o), data);
|
||||
if(o instanceof ItemStack)
|
||||
stackMap.put(new ComparableStack((ItemStack)o), data);
|
||||
if(o instanceof ComparableStack)
|
||||
@ -156,10 +159,16 @@ public class HazardSystem {
|
||||
* @param player
|
||||
*/
|
||||
public static void updatePlayerInventory(EntityPlayer player) {
|
||||
|
||||
for(ItemStack stack : player.inventory.mainInventory) {
|
||||
|
||||
for(int i = 0; i < player.inventory.mainInventory.length; i++) {
|
||||
|
||||
ItemStack stack = player.inventory.mainInventory[i];
|
||||
if(stack != null) {
|
||||
applyHazards(stack, player);
|
||||
|
||||
if(stack.stackSize == 0) {
|
||||
player.inventory.mainInventory[i] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@ import java.util.List;
|
||||
import com.hbm.hazard.HazardModifier;
|
||||
import com.hbm.util.I18nUtil;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@ -18,7 +17,7 @@ public class HazardTypeExplosive extends HazardTypeBase {
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
|
||||
if(!target.worldObj.isRemote && target.isBurning()) {
|
||||
stack = null;
|
||||
stack.stackSize = 0;
|
||||
target.worldObj.newExplosion(null, target.posX, target.posY + target.getEyeHeight() - target.getYOffset(), target.posZ, level, false, true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ public class HazardTypeHydroactive extends HazardTypeBase {
|
||||
@Override
|
||||
public void onUpdate(EntityLivingBase target, float level, ItemStack stack) {
|
||||
if(target.isWet()) {
|
||||
stack = null;
|
||||
stack.stackSize = 0;
|
||||
target.worldObj.newExplosion(null, target.posX, target.posY + target.getEyeHeight() - target.getYOffset(), target.posZ, level, false, true);
|
||||
}
|
||||
}
|
||||
@ -34,4 +34,4 @@ public class HazardTypeHydroactive extends HazardTypeBase {
|
||||
public void addHazardInformation(EntityPlayer player, List list, float level, ItemStack stack, List<HazardModifier> modifiers) {
|
||||
list.add(EnumChatFormatting.RED + "[" + I18nUtil.resolveKey("trait.hydro") + "]");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -13,12 +13,15 @@ import com.hbm.hazard.HazardEntry;
|
||||
import com.hbm.hazard.HazardRegistry;
|
||||
import com.hbm.hazard.HazardSystem;
|
||||
import com.hbm.interfaces.Untested;
|
||||
import com.hbm.items.ModItems;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
public class OreDictManager {
|
||||
|
||||
@ -45,7 +48,7 @@ public class OreDictManager {
|
||||
new DictFrame("Thorium232", "Th232", "Thorium") .rad(HazardRegistry.th232) .nugget(nugget_th232) .billet(billet_th232) .ingot(ingot_th232) .dust(powder_thorium) .block(block_thorium) .ore(ore_thorium, ore_meteor_thorium);
|
||||
new DictFrame("Plutonium") .rad(HazardRegistry.pu) .nugget(nugget_plutonium) .billet(billet_plutonium) .ingot(ingot_plutonium) .dust(powder_plutonium) .block(block_plutonium) .ore(ore_nether_plutonium);
|
||||
new DictFrame("PlutoniumRG") .rad(HazardRegistry.purg) .nugget(nugget_pu_mix) .billet(billet_pu_mix) .ingot(ingot_pu_mix) .block(block_pu_mix);
|
||||
new DictFrame("Plutonium238", "Pu238") .rad(HazardRegistry.pu238) .nugget(nugget_pu238) .billet(billet_pu238) .ingot(ingot_pu238) .block(block_pu238);
|
||||
new DictFrame("Plutonium238", "Pu238") .rad(HazardRegistry.pu238).hot(3F) .nugget(nugget_pu238) .billet(billet_pu238) .ingot(ingot_pu238) .block(block_pu238);
|
||||
new DictFrame("Plutonium239", "Pu239") .rad(HazardRegistry.pu239) .nugget(nugget_pu239) .billet(billet_pu239) .ingot(ingot_pu239) .block(block_pu239);
|
||||
new DictFrame("Plutonium240", "Pu240") .rad(HazardRegistry.pu240) .nugget(nugget_pu240) .billet(billet_pu240) .ingot(ingot_pu240) .block(block_pu240);
|
||||
new DictFrame("Plutonium241", "Pu241") .rad(HazardRegistry.pu241) .nugget(nugget_pu241) .billet(billet_pu241) .ingot(ingot_pu241); //.block(block_pu241);
|
||||
@ -53,13 +56,14 @@ public class OreDictManager {
|
||||
new DictFrame("Americium242", "Am242") .rad(HazardRegistry.am242) .nugget(nugget_am242) .billet(billet_am242) .ingot(ingot_am242);
|
||||
new DictFrame("AmericiumRG") .rad(HazardRegistry.amrg) .nugget(nugget_am_mix) .billet(billet_am_mix) .ingot(ingot_am_mix);
|
||||
new DictFrame("Neptunium237", "Np237", "Neptunium") .rad(HazardRegistry.np237) .nugget(nugget_neptunium) .billet(billet_neptunium) .ingot(ingot_neptunium) .dust(powder_neptunium) .block(block_neptunium);
|
||||
new DictFrame("Polonium210", "Po210") .rad(HazardRegistry.po210).hot(3) .nugget(nugget_polonium) .billet(billet_polonium) .ingot(ingot_polonium) .dust(powder_polonium) .block(block_polonium);
|
||||
new DictFrame("Polonium210", "Po210", "Polonium") .rad(HazardRegistry.po210).hot(3) .nugget(nugget_polonium) .billet(billet_polonium) .ingot(ingot_polonium) .dust(powder_polonium) .block(block_polonium);
|
||||
new DictFrame("Technetium99", "Tc99") .rad(HazardRegistry.tc99) .nugget(nugget_technetium) .billet(billet_technetium) .ingot(ingot_technetium);
|
||||
new DictFrame("Radium226", "Ra226") .rad(HazardRegistry.ra226) .nugget(nugget_ra226);
|
||||
new DictFrame("Cobalt60", "Co60") .rad(HazardRegistry.co60).hot(1) .nugget(nugget_co60) .billet(billet_co60) .ingot(ingot_co60) .dust(powder_co60);
|
||||
new DictFrame("Gold198", "Au198") .rad(HazardRegistry.au198).hot(5) .nugget(nugget_au198) .billet(billet_au198) .ingot(ingot_au198) .dust(powder_au198);
|
||||
new DictFrame("Schrabidium") .rad(HazardRegistry.sa326).blinding(3F) .nugget(nugget_schrabidium) .billet(billet_schrabidium) .ingot(ingot_schrabidium) .dust(powder_schrabidium) .plate(plate_schrabidium) .block(block_schrabidium) .ore(ore_schrabidium, ore_gneiss_schrabidium, ore_nether_schrabidium);
|
||||
new DictFrame("Solinium") .rad(HazardRegistry.sa327).blinding(3F) .nugget(nugget_solinium) .billet(billet_solinium) .ingot(ingot_solinium) .block(block_solinium);
|
||||
new DictFrame("Schrabidate") .rad(HazardRegistry.sb) .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate);
|
||||
|
||||
/*
|
||||
* STABLE
|
||||
@ -83,7 +87,6 @@ public class OreDictManager {
|
||||
new DictFrame("Graphite") .ingot(ingot_graphite) .block(block_graphite);
|
||||
new DictFrame("DuraSteel") .ingot(ingot_dura_steel) .dust(powder_dura_steel) .block(block_dura_steel);
|
||||
new DictFrame("Polymer") .ingot(ingot_polymer) .dust(powder_polymer);
|
||||
new DictFrame("Schrabidate") .ingot(ingot_schrabidate) .dust(powder_schrabidate) .block(block_schrabidate);
|
||||
new DictFrame("MagnetizedTungsten") .ingot(ingot_magnetized_tungsten) .dust(powder_magnetized_tungsten) .block(block_magnetized_tungsten);
|
||||
new DictFrame("CMBSteel") .ingot(ingot_combine_steel) .dust(powder_combine_steel) .plate(plate_combine_steel) .block(block_combine_steel);
|
||||
new DictFrame("Desh") .nugget(nugget_desh) .ingot(ingot_desh) .dust(powder_desh) .block(block_desh);
|
||||
@ -91,7 +94,6 @@ public class OreDictManager {
|
||||
new DictFrame("Saturnite") .ingot(ingot_saturnite) .plate(plate_saturnite);
|
||||
new DictFrame("Euphemium") .nugget(nugget_euphemium) .ingot(ingot_euphemium) .dust(powder_euphemium) .block(block_euphemium);
|
||||
new DictFrame("Dineutronium") .nugget(nugget_dineutronium) .ingot(ingot_dineutronium) .dust(powder_dineutronium) .block(block_dineutronium);
|
||||
new DictFrame("Lithium") .ingot(lithium) .dustSmall(powder_lithium_tiny) .dust(powder_lithium) .block(block_lithium) .ore(ore_gneiss_lithium, ore_meteor_lithium);
|
||||
new DictFrame("Fiberglass") .ingot(ingot_fiberglass) .block(block_fiberglass);
|
||||
new DictFrame("Asbestos") .asbestos(1F) .ingot(ingot_asbestos) .dust(powder_asbestos) .block(block_asbestos) .ore(ore_asbestos, ore_gneiss_asbestos, basalt_asbestos);
|
||||
|
||||
@ -104,6 +106,11 @@ public class OreDictManager {
|
||||
new DictFrame("Lignite") .gem(lignite) .dust(powder_lignite) .ore(ore_lignite);
|
||||
new DictFrame("Cinnabar") .crystal(cinnebar) .gem(cinnebar) .ore(ore_cinnebar, ore_depth_cinnebar);
|
||||
new DictFrame("Volcanic") .gem(gem_volcanic) .ore(basalt_gem);
|
||||
|
||||
/*
|
||||
* HAZARDS, MISC
|
||||
*/
|
||||
new DictFrame("Lithium") .hydro(1F) .ingot(lithium) .dustSmall(powder_lithium_tiny) .dust(powder_lithium) .block(block_lithium) .ore(ore_gneiss_lithium, ore_meteor_lithium);
|
||||
|
||||
/*
|
||||
* PHOSPHORUS
|
||||
@ -135,14 +142,18 @@ public class OreDictManager {
|
||||
*/
|
||||
new DictFrame("Iodine") .dust(powder_iodine);
|
||||
new DictFrame("Astatine") .dust(powder_astatine);
|
||||
new DictFrame("Caesium") .dust(powder_caesium);
|
||||
new DictFrame("Strontium") .dust(powder_strontium);
|
||||
new DictFrame("Bromine") .dust(powder_bromine);
|
||||
new DictFrame("Tennessine") .dust(powder_tennessine);
|
||||
|
||||
/*
|
||||
* FISSION FRAGMENTS
|
||||
*/
|
||||
new DictFrame("Iodine131", "I131") .dustSmall(powder_i131_tiny) .dust(powder_i131);
|
||||
new DictFrame("Xenon135", "Xe135") .dustSmall(powder_xe135_tiny) .dust(powder_xe135);
|
||||
new DictFrame("Caesium137", "Cs137") .dustSmall(powder_cs137_tiny) .dust(powder_cs137);
|
||||
new DictFrame("Astatine209", "At209") .dust(powder_at209);
|
||||
new DictFrame("Iodine131", "I131") .rad(HazardRegistry.i131) .hot(1F) .dustSmall(powder_i131_tiny) .dust(powder_i131);
|
||||
new DictFrame("Xenon135", "Xe135") .rad(HazardRegistry.xe135) .hot(10F) .dustSmall(powder_xe135_tiny) .dust(powder_xe135);
|
||||
new DictFrame("Caesium137", "Cs137") .rad(HazardRegistry.cs137) .hot(3F) .hydro(3F) .dustSmall(powder_cs137_tiny) .dust(powder_cs137);
|
||||
new DictFrame("Astatine209", "At209") .rad(HazardRegistry.at209) .hot(20F) .dust(powder_at209);
|
||||
|
||||
OreDictionary.registerOre(getReflector(), neutron_reflector);
|
||||
OreDictionary.registerOre("oreRareEarth", ore_rare);
|
||||
@ -212,6 +223,9 @@ public class OreDictManager {
|
||||
public DictFrame asbestos(float asb) {
|
||||
return this.haz(new HazardEntry(HazardRegistry.ASBESTOS, asb));
|
||||
}
|
||||
public DictFrame hydro(float h) {
|
||||
return this.haz(new HazardEntry(HazardRegistry.HYDROACTIVE, h));
|
||||
}
|
||||
public DictFrame haz(HazardEntry hazard) {
|
||||
hazards.add(hazard);
|
||||
return this;
|
||||
|
||||
@ -63,6 +63,8 @@ public class ArmorHazmatMask extends ArmorHazmat implements IGasMask {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
|
||||
ArmorUtil.addGasMaskTooltip(stack, player, list, ext);
|
||||
|
||||
super.addInformation(stack, player, list, ext);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -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 (3997)";
|
||||
public static final String VERSION = "1.0.27 BETA (4000)";
|
||||
//HBM's Beta Naming Convention:
|
||||
//V T (X)
|
||||
//V -> next release version
|
||||
|
||||
@ -3,6 +3,7 @@ package com.hbm.particle;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.hbm.lib.RefStrings;
|
||||
import com.hbm.main.ModEventHandlerClient;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@ -17,16 +18,14 @@ import net.minecraft.world.World;
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ParticleCoolingTower extends EntityFX {
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/particle_base.png");
|
||||
private TextureManager theRenderEngine;
|
||||
private float baseScale = 1.0F;
|
||||
private float maxScale = 1.0F;
|
||||
private float lift = 0.3F;
|
||||
|
||||
public ParticleCoolingTower(TextureManager texman, World world, double x, double y, double z) {
|
||||
super(world, x, y, z);
|
||||
particleIcon = ModEventHandlerClient.particleBase;
|
||||
this.particleRed = this.particleGreen = this.particleBlue = 0.9F + world.rand.nextFloat() * 0.05F;
|
||||
this.theRenderEngine = texman;
|
||||
this.noClip = true;
|
||||
}
|
||||
|
||||
@ -81,39 +80,21 @@ public class ParticleCoolingTower extends EntityFX {
|
||||
}
|
||||
|
||||
public int getFXLayer() {
|
||||
return 3;
|
||||
return 1;
|
||||
}
|
||||
|
||||
public void renderParticle(Tessellator tess, float interp, float fX, float fY, float fZ, float sX, float sZ) {
|
||||
|
||||
this.theRenderEngine.bindTexture(texture);
|
||||
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0F);
|
||||
GL11.glDepthMask(false);
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
tess.startDrawingQuads();
|
||||
|
||||
tess.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha);
|
||||
tess.setNormal(0.0F, 1.0F, 0.0F);
|
||||
|
||||
float scale = this.particleScale;
|
||||
float pX = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) interp - interpPosX);
|
||||
float pY = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) interp - interpPosY);
|
||||
float pZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) interp - interpPosZ);
|
||||
|
||||
tess.addVertexWithUV((double) (pX - fX * scale - sX * scale), (double) (pY - fY * scale), (double) (pZ - fZ * scale - sZ * scale), 1, 1);
|
||||
tess.addVertexWithUV((double) (pX - fX * scale + sX * scale), (double) (pY + fY * scale), (double) (pZ - fZ * scale + sZ * scale), 1, 0);
|
||||
tess.addVertexWithUV((double) (pX + fX * scale + sX * scale), (double) (pY + fY * scale), (double) (pZ + fZ * scale + sZ * scale), 0, 0);
|
||||
tess.addVertexWithUV((double) (pX + fX * scale - sX * scale), (double) (pY - fY * scale), (double) (pZ + fZ * scale - sZ * scale), 0, 1);
|
||||
tess.draw();
|
||||
|
||||
GL11.glPolygonOffset(0.0F, 0.0F);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
tess.addVertexWithUV((double) (pX - fX * scale - sX * scale), (double) (pY - fY * scale), (double) (pZ - fZ * scale - sZ * scale), particleIcon.getMaxU(), particleIcon.getMaxV());
|
||||
tess.addVertexWithUV((double) (pX - fX * scale + sX * scale), (double) (pY + fY * scale), (double) (pZ - fZ * scale + sZ * scale), particleIcon.getMaxU(), particleIcon.getMinV());
|
||||
tess.addVertexWithUV((double) (pX + fX * scale + sX * scale), (double) (pY + fY * scale), (double) (pZ + fZ * scale + sZ * scale), particleIcon.getMinU(), particleIcon.getMinV());
|
||||
tess.addVertexWithUV((double) (pX + fX * scale - sX * scale), (double) (pY - fY * scale), (double) (pZ + fZ * scale - sZ * scale), particleIcon.getMinU(), particleIcon.getMaxV());
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
"modid": "hbm",
|
||||
"name": "Hbm's Nuclear Tech",
|
||||
"description": "A mod that adds weapons, nuclear themed stuff and machines",
|
||||
"version":"1.0.27_X3997",
|
||||
"version":"1.0.27_X4000",
|
||||
"mcversion": "1.7.10",
|
||||
"url": "",
|
||||
"updateUrl": "",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user