mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
we're in a rush now
This commit is contained in:
Bob
parent
62d6408558
commit
f904636517
@ -7,6 +7,8 @@
|
||||
* All launch pad blocks can now accept items, not just ports
|
||||
* Removed the old watz pellets and titanium filter
|
||||
* Removed copper panels, cast copper plates now take its place in most use-cases
|
||||
* Removed generator bodies and rotors, recipes use 6 dense gold wires per generator instead
|
||||
* Removed reinforced turbine shafts, most turbines now use HSS pipes instead
|
||||
* Removed the steam batteries (why did we even have those?)
|
||||
* Large and small shells have been merged into a single item which uses material autogen
|
||||
* A copper variant for shells has been added which is used for artillery shells
|
||||
@ -14,7 +16,11 @@
|
||||
* Most instances of the expensive steel pipes as well as the decorative pipes which need tons of microcrafting have been replaced with a new pipe item
|
||||
* The new pipes also use autogen, being available in different materials
|
||||
* Some of the recipes that used the small shells now use pipes instead
|
||||
* Tenfolded the throughout of powered condensers
|
||||
* Regular and combo filters now work for blistering agents (like mustard gas or air pollution)
|
||||
* Wires now render two faces instead of one, making them appear equally thick from any viewed angle
|
||||
|
||||
## Fixed
|
||||
* Fixed crash caused by invalid default loot pool configuration
|
||||
* Fixeed enchantment glint not rendering on upscaled items like certain swords or tier 2 pickaxes
|
||||
* Fixed enchantment glint not rendering on upscaled items like certain swords or tier 2 pickaxes
|
||||
* Fixed wire connections becoming invisible when pointing straight down, wires should now rotate correctly
|
||||
|
||||
@ -141,7 +141,6 @@ public class BlockCrate extends BlockFalling {
|
||||
BlockCrate.addToListWithWeight(metalList, ModItems.coil_copper, 10);
|
||||
BlockCrate.addToListWithWeight(metalList, ModItems.tank_steel, 9);
|
||||
BlockCrate.addToListWithWeight(metalList, ModItems.blade_titanium, 3);
|
||||
BlockCrate.addToListWithWeight(metalList, ModItems.bolt_compound, 2);
|
||||
BlockCrate.addToListWithWeight(metalList, ModItems.piston_selenium, 6);
|
||||
|
||||
// Red Crate
|
||||
|
||||
@ -18,11 +18,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.EnumCreatureType;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.monster.IMob;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.nbt.CompressedStreamTools;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
@ -31,6 +34,7 @@ import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.ChunkCoordIntPair;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraft.world.gen.ChunkProviderServer;
|
||||
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
|
||||
import net.minecraftforge.event.world.WorldEvent;
|
||||
@ -183,6 +187,8 @@ public class PollutionHandler {
|
||||
public void updateSystem(TickEvent.ServerTickEvent event) {
|
||||
|
||||
if(event.side == Side.SERVER && event.phase == Phase.END) {
|
||||
|
||||
handleWorldDestruction();
|
||||
|
||||
eggTimer++;
|
||||
if(eggTimer < 60) return;
|
||||
@ -252,6 +258,43 @@ public class PollutionHandler {
|
||||
}
|
||||
}
|
||||
|
||||
protected static final float DESTRUCTION_THRESHOLD = 15F;
|
||||
protected static final int DESTRUCTION_COUNT = 5;
|
||||
|
||||
protected static void handleWorldDestruction() {
|
||||
|
||||
for(Entry<World, PollutionPerWorld> entry : perWorld.entrySet()) {
|
||||
|
||||
World world = entry.getKey();
|
||||
WorldServer serv = (WorldServer) world;
|
||||
ChunkProviderServer provider = (ChunkProviderServer) serv.getChunkProvider();
|
||||
|
||||
for(Entry<ChunkCoordIntPair, PollutionData> pollution : entry.getValue().pollution.entrySet()) {
|
||||
|
||||
float poison = pollution.getValue().pollution[PollutionType.POISON.ordinal()];
|
||||
if(poison < DESTRUCTION_THRESHOLD) continue;
|
||||
|
||||
ChunkCoordIntPair entryPos = pollution.getKey();
|
||||
|
||||
for(int i = 0; i < DESTRUCTION_COUNT; i++) {
|
||||
int x = (entryPos.chunkXPos << 6) + world.rand.nextInt(64);
|
||||
int z = (entryPos.chunkZPos << 6) + world.rand.nextInt(64);
|
||||
|
||||
if(provider.chunkExists(x >> 4, z >> 4)) {
|
||||
int y = world.getHeightValue(x, z) - world.rand.nextInt(3) + 1;
|
||||
Block b = world.getBlock(x, y, z);
|
||||
|
||||
if(b == Blocks.grass || (b == Blocks.dirt && world.getBlockMetadata(x, y, z) == 0)) {
|
||||
world.setBlock(x, y, z, Blocks.dirt, 1, 3);
|
||||
} else if(b == Blocks.tallgrass || b.getMaterial() == Material.leaves || b.getMaterial() == Material.plants) {
|
||||
world.setBlock(x, y, z, Blocks.air);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////
|
||||
/// DATA STRUCTURE ///
|
||||
//////////////////////
|
||||
|
||||
@ -375,7 +375,7 @@ public class OreDictManager {
|
||||
CO .nugget(fragment_cobalt) .nugget(nugget_cobalt) .billet(billet_cobalt) .ingot(ingot_cobalt) .dust(powder_cobalt) .dustSmall(powder_cobalt_tiny) .block(block_cobalt) .ore(ore_cobalt, ore_nether_cobalt);
|
||||
B .nugget(fragment_boron) .ingot(ingot_boron) .dustSmall(powder_boron_tiny) .dust(powder_boron) .block(block_boron);
|
||||
GRAPHITE .ingot(ingot_graphite) .block(block_graphite);
|
||||
DURA .ingot(ingot_dura_steel) .dust(powder_dura_steel) .block(block_dura_steel);
|
||||
DURA .ingot(ingot_dura_steel) .dust(powder_dura_steel) .plate(plate_dura_steel) .block(block_dura_steel);
|
||||
POLYMER .ingot(ingot_polymer) .dust(powder_polymer) .block(block_polymer);
|
||||
BAKELITE .ingot(ingot_bakelite) .dust(powder_bakelite) .block(block_bakelite);
|
||||
LATEX .gem(ball_resin) .ingot(ingot_biorubber);
|
||||
|
||||
@ -210,7 +210,7 @@ public class Fluids {
|
||||
|
||||
public static final FT_Polluting P_OIL = new FT_Polluting().burn(PollutionType.SOOT, SOOT_UNREFINED_OIL).release(PollutionType.POISON, POISON_OIL);
|
||||
public static final FT_Polluting P_FUEL = new FT_Polluting().burn(PollutionType.SOOT, SOOT_REFINED_OIL).release(PollutionType.POISON, POISON_OIL);
|
||||
public static final FT_Polluting P_FUEL_LEADED = new FT_Polluting().burn(PollutionType.SOOT, SOOT_REFINED_OIL).burn(PollutionType.HEAVYMETAL, LEAD_FUEL).release(PollutionType.POISON, POISON_OIL).release(PollutionType.HEAVYMETAL, LEAD_FUEL);
|
||||
public static final FT_Polluting P_FUEL_LEADED = new FT_Polluting().burn(PollutionType.SOOT, SOOT_REFINED_OIL).burn(PollutionType.HEAVYMETAL, LEAD_FUEL).release(PollutionType.POISON, POISON_OIL).release(PollutionType.HEAVYMETAL, LEAD_FUEL * 0.1F);
|
||||
public static final FT_Polluting P_GAS = new FT_Polluting().burn(PollutionType.SOOT, SOOT_GAS);
|
||||
public static final FT_Polluting P_LIQUID_GAS = new FT_Polluting().burn(PollutionType.SOOT, SOOT_GAS * 2F);
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ public class Mats {
|
||||
public static final NTMMaterial MAT_STEEL = makeSmeltable(_AS + 0, STEEL, 0xAFAFAF, 0x0F0F0F, 0x4A4A4A).setShapes(DUSTTINY, BOLT, INGOT, DUST, PLATE, CASTPLATE, WELDEDPLATE, SHELL, PIPE, BLOCK, HEAVY_COMPONENT);
|
||||
public static final NTMMaterial MAT_MINGRADE = makeSmeltable(_AS + 1, MINGRADE, 0xFFBA7D, 0xAF1700, 0xE44C0F).setShapes(WIRE, INGOT, DUST, BLOCK);
|
||||
public static final NTMMaterial MAT_ALLOY = makeSmeltable(_AS + 2, ALLOY, 0xFF8330, 0x700000, 0xFF7318).setShapes(WIRE, INGOT, DUST, DENSEWIRE, PLATE, CASTPLATE, BLOCK, HEAVY_COMPONENT);
|
||||
public static final NTMMaterial MAT_DURA = makeSmeltable(_AS + 3, DURA, 0x183039, 0x030B0B, 0x376373).setShapes(BOLT, INGOT, DUST, BLOCK);
|
||||
public static final NTMMaterial MAT_DURA = makeSmeltable(_AS + 3, DURA, 0x183039, 0x030B0B, 0x376373).setShapes(BOLT, INGOT, DUST, PIPE, BLOCK);
|
||||
public static final NTMMaterial MAT_SATURN = makeSmeltable(_AS + 4, BIGMT, 0x4DA3AF, 0x00000C, 0x4DA3AF).setShapes(INGOT, DUST, PLATE, CASTPLATE, BLOCK);
|
||||
public static final NTMMaterial MAT_DESH = makeSmeltable(_AS + 12, DESH, 0xFF6D6D, 0x720000, 0xF22929).setShapes(INGOT, DUST, CASTPLATE, BLOCK, HEAVY_COMPONENT);
|
||||
public static final NTMMaterial MAT_STAR = makeSmeltable(_AS + 5, STAR, 0xCCCCEA, 0x11111A, 0xA5A5D3).setShapes(INGOT, DUST, DENSEWIRE, BLOCK);
|
||||
|
||||
@ -183,8 +183,8 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_bat9000, 1), new AStack[] {new OreDictStack(STEEL.plate528(), 16), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 2), new ComparableStack(ModBlocks.steel_scaffold, 16), new OreDictStack(ANY_TAR.any(), 16), },150);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_orbus, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(ANY_RESISTANTALLOY.plateWelded(), 8), new OreDictStack(BIGMT.plate(), 12), new ComparableStack(ModItems.coil_advanced_alloy, 12), new ComparableStack(ModItems.battery_sc_polonium, 1) }, 200);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), !exp ? new OreDictStack(STEEL.plate528(), 16) : new OreDictStack(STEEL.heavyComp(), 3), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 3), new OreDictStack(ANY_PLASTIC.ingot(), 4), new ComparableStack(ModItems.motor, 3), !exp ? new OreDictStack(DURA.ingot(), 4) : new OreDictStack(DESH.heavyComp(), 1), new OreDictStack(DURA.bolt(), 8), new ComparableStack(ModBlocks.machine_battery, 3), },400);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_turbofan, 1), new AStack[] {!exp ? new OreDictStack(STEEL.shell(), 3) : new OreDictStack(STEEL.heavyComp(), 1), new OreDictStack(TI.shell(), 3), new ComparableStack(ModItems.turbine_tungsten, 1), new ComparableStack(ModItems.turbine_titanium, 7), new ComparableStack(ModItems.bolt_compound, 8), new OreDictStack(MINGRADE.ingot(), 12), new ComparableStack(ModItems.wire_red_copper, 24), },500);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_turbinegas, 1), new AStack[] {!exp ? new OreDictStack(STEEL.shell(), 10) : new OreDictStack(STEEL.heavyComp(), 2), new ComparableStack(ModItems.generator_steel, 2), new ComparableStack(ModItems.bolt_compound, 4), new ComparableStack(ModBlocks.steel_scaffold, 8), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.turbine_tungsten, 3), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.ingot_rubber, 4), new ComparableStack(ModItems.circuit_red_copper, 3)}, 600);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_turbofan, 1), new AStack[] {!exp ? new OreDictStack(STEEL.shell(), 3) : new OreDictStack(STEEL.heavyComp(), 1), new OreDictStack(TI.shell(), 3), new ComparableStack(ModItems.turbine_tungsten, 1), new ComparableStack(ModItems.turbine_titanium, 7), new OreDictStack(DURA.pipe(), 4), new OreDictStack(MINGRADE.ingot(), 12), new ComparableStack(ModItems.wire_red_copper, 24), },500);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_turbinegas, 1), new AStack[] {!exp ? new OreDictStack(STEEL.shell(), 10) : new OreDictStack(STEEL.heavyComp(), 2), new OreDictStack(GOLD.wireDense(), 12), new OreDictStack(DURA.pipe(), 4), new ComparableStack(ModBlocks.steel_scaffold, 8), new OreDictStack(STEEL.pipe(), 4), new ComparableStack(ModItems.turbine_tungsten, 3), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.ingot_rubber, 4), new ComparableStack(ModItems.circuit_red_copper, 3)}, 600);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_teleporter, 1), new AStack[] {new OreDictStack(TI.ingot(), 8), new OreDictStack(ALLOY.plate528(), 12), new ComparableStack(ModItems.wire_gold, 32), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 1) },300);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_transmutator, 1), new AStack[] {new OreDictStack(MAGTUNG.ingot(), 1), !exp ? new OreDictStack(TI.ingot(), 24) : new OreDictStack(TI.heavyComp(), 2), !exp ? new OreDictStack(ALLOY.plate(), 18) : new OreDictStack(ALLOY.heavyComp(), 1), new OreDictStack(STEEL.plateWelded(), 12), new ComparableStack(ModItems.plate_desh, 6), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModBlocks.machine_battery, 5), new ComparableStack(ModItems.circuit_gold, 5), },500);
|
||||
makeRecipe(new ComparableStack(ModBlocks.fusion_conductor, 1), new AStack[] {new ComparableStack(ModItems.coil_advanced_alloy, 5), }, 100);
|
||||
@ -330,7 +330,7 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
new OreDictStack(STEEL.plate528(), 12),
|
||||
new OreDictStack(IRON.plate(), 8),
|
||||
new OreDictStack(CU.ingot(), 8),
|
||||
new ComparableStack(ModItems.generator_steel, 1),
|
||||
new OreDictStack(GOLD.wireDense(), 6),
|
||||
new ComparableStack(ModItems.tank_steel, 2),
|
||||
new OreDictStack(W.bolt(), 16),
|
||||
new ComparableStack(ModItems.wire_red_copper, 24),
|
||||
@ -362,14 +362,14 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
new OreDictStack(ANY_PLASTIC.ingot(), 12),
|
||||
new OreDictStack(CU.plate(), 24),
|
||||
new OreDictStack(W.ingot(), 16),
|
||||
new ComparableStack(ModItems.bolt_compound, 16)
|
||||
new OreDictStack(DURA.pipe(), 4)
|
||||
}, 200);
|
||||
makeRecipe(new ComparableStack(ModItems.piston_set, 1, EnumPistonType.STARMETAL.ordinal()), new AStack[] {
|
||||
new OreDictStack(STAR.ingot(), 24),
|
||||
new OreDictStack(RUBBER.ingot(), 16),
|
||||
new OreDictStack(BIGMT.plate(), 24),
|
||||
new OreDictStack(NB.ingot(), 16),
|
||||
new ComparableStack(ModItems.bolt_compound, 16)
|
||||
new OreDictStack(DURA.pipe(), 4)
|
||||
}, 200);
|
||||
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_excavator, 1), new AStack[] {
|
||||
@ -434,8 +434,8 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
!exp ? new OreDictStack(STEEL.plate528(), 12) : new OreDictStack(STEEL.heavyComp(), 1),
|
||||
new OreDictStack(RUBBER.ingot(), 4),
|
||||
new ComparableStack(ModItems.turbine_titanium, 3),
|
||||
new ComparableStack(ModItems.generator_steel, 1),
|
||||
new ComparableStack(ModItems.bolt_compound, 3),
|
||||
new OreDictStack(GOLD.wireDense(), 6),
|
||||
new OreDictStack(DURA.pipe(), 3),
|
||||
new OreDictStack(STEEL.pipe(), 4),
|
||||
new ComparableStack(ModItems.circuit_aluminium, 1),
|
||||
}, 200);
|
||||
@ -447,8 +447,8 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
new ComparableStack(ModItems.turbine_tungsten, 5),
|
||||
new ComparableStack(ModItems.turbine_titanium, 3),
|
||||
new ComparableStack(ModItems.flywheel_beryllium, 1),
|
||||
new ComparableStack(ModItems.generator_steel, 10),
|
||||
new ComparableStack(ModItems.bolt_compound, 16),
|
||||
new OreDictStack(GOLD.wireDense(), 48),
|
||||
new OreDictStack(DURA.pipe(), 16),
|
||||
new OreDictStack(STEEL.pipe(), 16)
|
||||
}, 600);
|
||||
|
||||
@ -789,13 +789,11 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
new ComparableStack(ModItems.crystal_diamond, 1)
|
||||
}, 400);
|
||||
makeRecipe(new ComparableStack(Item.getItemFromBlock(ModBlocks.machine_fel), 1), new AStack[] {
|
||||
new ComparableStack(ModBlocks.fusion_conductor, 16),
|
||||
new ComparableStack(ModBlocks.machine_lithium_battery, 2),
|
||||
new OreDictStack(STEEL.ingot(), 16),
|
||||
new OreDictStack(ALLOY.wireDense(), 64),
|
||||
!exp ? new OreDictStack(STEEL.plate528(), 24) : new OreDictStack(STEEL.heavyComp(), 1),
|
||||
new OreDictStack(ANY_PLASTIC.ingot(), 8),
|
||||
new OreDictStack(ANY_PLASTIC.ingot(), 16),
|
||||
new ComparableStack(ModItems.circuit_red_copper, 4),
|
||||
new ComparableStack(ModItems.wire_red_copper, 64),
|
||||
new ComparableStack(ModItems.coil_advanced_torus, 16),
|
||||
new ComparableStack(ModItems.circuit_gold, 1)
|
||||
}, 400);
|
||||
|
||||
@ -80,6 +80,7 @@ public class PressRecipes extends SerializableRecipe {
|
||||
makeRecipe(StampType.PLATE, new OreDictStack(SA326.ingot()), ModItems.plate_schrabidium);
|
||||
makeRecipe(StampType.PLATE, new OreDictStack(CMB.ingot()), ModItems.plate_combine_steel);
|
||||
makeRecipe(StampType.PLATE, new OreDictStack(BIGMT.ingot()), ModItems.plate_saturnite);
|
||||
makeRecipe(StampType.PLATE, new OreDictStack(DURA.ingot()), ModItems.plate_dura_steel);
|
||||
|
||||
makeRecipe(StampType.WIRE, new OreDictStack(AL.ingot()), new ItemStack(ModItems.wire_aluminium, 8));
|
||||
makeRecipe(StampType.WIRE, new OreDictStack(CU.ingot()), new ItemStack(ModItems.wire_copper, 8));
|
||||
|
||||
@ -17,7 +17,8 @@ import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
public class ItemCustomLore extends Item {
|
||||
|
||||
EnumRarity rarity;
|
||||
protected EnumRarity rarity;
|
||||
protected boolean hasEffect = false;
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
|
||||
@ -80,21 +81,19 @@ public class ItemCustomLore extends Item {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public boolean hasEffect(ItemStack p_77636_1_) {
|
||||
if(this == ModItems.rune_isa || this == ModItems.rune_dagaz ||
|
||||
this == ModItems.rune_hagalaz || this == ModItems.rune_jera ||
|
||||
this == ModItems.rune_thurisaz || this == ModItems.egg_balefire_shard ||
|
||||
this == ModItems.egg_balefire) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
public boolean hasEffect(ItemStack stack) {
|
||||
return hasEffect;
|
||||
}
|
||||
|
||||
public ItemCustomLore setRarity(EnumRarity rarity) {
|
||||
this.rarity = rarity;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ItemCustomLore setEffect() {
|
||||
this.hasEffect = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item setUnlocalizedName(String uloc) {
|
||||
|
||||
@ -309,6 +309,7 @@ public class ModItems {
|
||||
public static Item ingot_osmiridium;
|
||||
public static Item nugget_osmiridium;
|
||||
public static Item plate_lead;
|
||||
public static Item plate_dura_steel;
|
||||
public static Item nugget_schrabidium;
|
||||
public static Item plate_schrabidium;
|
||||
public static Item plate_copper;
|
||||
@ -332,7 +333,6 @@ public class ModItems {
|
||||
public static Item plate_euphemium;
|
||||
public static Item bolt;
|
||||
public static Item bolt_spike;
|
||||
public static Item bolt_compound;
|
||||
public static Item plate_polymer;
|
||||
public static Item plate_kevlar;
|
||||
public static Item plate_dineutronium;
|
||||
@ -668,8 +668,6 @@ public class ModItems {
|
||||
public static Item sphere_steel;
|
||||
public static Item pedestal_steel;
|
||||
public static Item dysfunctional_reactor;
|
||||
public static Item rotor_steel;
|
||||
public static Item generator_steel;
|
||||
public static Item blade_titanium;
|
||||
public static Item turbine_titanium;
|
||||
public static Item generator_front;
|
||||
@ -2568,6 +2566,7 @@ public class ModItems {
|
||||
plate_iron = new Item().setUnlocalizedName("plate_iron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_iron");
|
||||
ingot_lead = new Item().setUnlocalizedName("ingot_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lead");
|
||||
plate_lead = new Item().setUnlocalizedName("plate_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_lead");
|
||||
plate_dura_steel = new Item().setUnlocalizedName("plate_dura_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_dura_steel");
|
||||
ingot_schraranium = new ItemSchraranium().setUnlocalizedName("ingot_schraranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schraranium");
|
||||
ingot_schrabidium = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("ingot_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidium");
|
||||
ingot_schrabidate = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("ingot_schrabidate").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_schrabidate");
|
||||
@ -2593,7 +2592,6 @@ public class ModItems {
|
||||
plate_euphemium = new ItemCustomLore().setRarity(EnumRarity.epic).setUnlocalizedName("plate_euphemium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_euphemium");
|
||||
bolt = new ItemAutogen(MaterialShapes.BOLT).setUnlocalizedName("bolt").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bolt");
|
||||
bolt_spike = new ItemCustomLore().setUnlocalizedName("bolt_spike").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bolt_spike");
|
||||
bolt_compound = new Item().setUnlocalizedName("bolt_compound").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bolt_compound");
|
||||
plate_polymer = new Item().setUnlocalizedName("plate_polymer").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_polymer");
|
||||
plate_kevlar = new Item().setUnlocalizedName("plate_kevlar").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_kevlar");
|
||||
plate_dineutronium = new Item().setUnlocalizedName("plate_dineutronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_dineutronium");
|
||||
@ -3021,8 +3019,6 @@ public class ModItems {
|
||||
sphere_steel = new Item().setUnlocalizedName("sphere_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sphere_steel");
|
||||
pedestal_steel = new Item().setUnlocalizedName("pedestal_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pedestal_steel");
|
||||
dysfunctional_reactor = new Item().setUnlocalizedName("dysfunctional_reactor").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":dysfunctional_reactor");
|
||||
rotor_steel = new Item().setUnlocalizedName("rotor_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":rotor_steel");
|
||||
generator_steel = new Item().setUnlocalizedName("generator_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":generator_steel");
|
||||
blade_titanium = new Item().setUnlocalizedName("blade_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":blade_titanium");
|
||||
turbine_titanium = new Item().setUnlocalizedName("turbine_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":turbine_titanium");
|
||||
generator_front = new Item().setUnlocalizedName("generator_front").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":generator_front");
|
||||
@ -3159,19 +3155,16 @@ public class ModItems {
|
||||
|
||||
tritium_deuterium_cake = new ItemCustomLore().setUnlocalizedName("tritium_deuterium_cake").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":tritium_deuterium_cake");
|
||||
|
||||
piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":piston_selenium");
|
||||
piston_selenium = new Item().setUnlocalizedName("piston_selenium").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":piston_selenium");
|
||||
piston_set = new ItemPistons().setUnlocalizedName("piston_set").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1);
|
||||
drillbit = new ItemDrillbit().setUnlocalizedName("drillbit").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1);
|
||||
|
||||
//crystal_energy = new ItemCustomLore().setUnlocalizedName("crystal_energy").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":crystal_energy");
|
||||
//pellet_coolant = new ItemCustomLore().setUnlocalizedName("pellet_coolant").setMaxDamage(41400).setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pellet_coolant");
|
||||
|
||||
rune_blank = new ItemCustomLore().setUnlocalizedName("rune_blank").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_blank");
|
||||
rune_isa = new ItemCustomLore().setUnlocalizedName("rune_isa").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_isa");
|
||||
rune_dagaz = new ItemCustomLore().setUnlocalizedName("rune_dagaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_dagaz");
|
||||
rune_hagalaz = new ItemCustomLore().setUnlocalizedName("rune_hagalaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_hagalaz");
|
||||
rune_jera = new ItemCustomLore().setUnlocalizedName("rune_jera").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_jera");
|
||||
rune_thurisaz = new ItemCustomLore().setUnlocalizedName("rune_thurisaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_thurisaz");
|
||||
rune_blank = new ItemCustomLore().setEffect().setUnlocalizedName("rune_blank").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_blank");
|
||||
rune_isa = new ItemCustomLore().setEffect().setUnlocalizedName("rune_isa").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_isa");
|
||||
rune_dagaz = new ItemCustomLore().setEffect().setUnlocalizedName("rune_dagaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_dagaz");
|
||||
rune_hagalaz = new ItemCustomLore().setEffect().setUnlocalizedName("rune_hagalaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_hagalaz");
|
||||
rune_jera = new ItemCustomLore().setEffect().setUnlocalizedName("rune_jera").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_jera");
|
||||
rune_thurisaz = new ItemCustomLore().setEffect().setUnlocalizedName("rune_thurisaz").setCreativeTab(MainRegistry.partsTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":rune_thurisaz");
|
||||
|
||||
ams_catalyst_blank = new Item().setUnlocalizedName("ams_catalyst_blank").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_blank");
|
||||
ams_catalyst_aluminium = new ItemCatalyst(0xCCCCCC, 1000000, 1.15F, 0.85F, 1.15F).setUnlocalizedName("ams_catalyst_aluminium").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ams_catalyst_aluminium");
|
||||
@ -6048,6 +6041,7 @@ public class ModItems {
|
||||
GameRegistry.registerItem(plate_lead, plate_lead.getUnlocalizedName());
|
||||
GameRegistry.registerItem(plate_copper, plate_copper.getUnlocalizedName());
|
||||
GameRegistry.registerItem(plate_advanced_alloy, plate_advanced_alloy.getUnlocalizedName());
|
||||
GameRegistry.registerItem(plate_dura_steel, plate_dura_steel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(neutron_reflector, neutron_reflector.getUnlocalizedName());
|
||||
GameRegistry.registerItem(plate_schrabidium, plate_schrabidium.getUnlocalizedName());
|
||||
GameRegistry.registerItem(plate_combine_steel, plate_combine_steel.getUnlocalizedName());
|
||||
@ -6073,12 +6067,13 @@ public class ModItems {
|
||||
//Heavy/Cast Plate
|
||||
GameRegistry.registerItem(plate_cast, plate_cast.getUnlocalizedName());
|
||||
GameRegistry.registerItem(plate_welded, plate_welded.getUnlocalizedName());
|
||||
GameRegistry.registerItem(shell, shell.getUnlocalizedName());
|
||||
GameRegistry.registerItem(pipe, pipe.getUnlocalizedName());
|
||||
GameRegistry.registerItem(heavy_component, heavy_component.getUnlocalizedName());
|
||||
|
||||
//Bolts
|
||||
GameRegistry.registerItem(bolt, bolt.getUnlocalizedName());
|
||||
GameRegistry.registerItem(bolt_spike, bolt_spike.getUnlocalizedName());
|
||||
GameRegistry.registerItem(bolt_compound, bolt_compound.getUnlocalizedName());
|
||||
|
||||
//Cloth
|
||||
GameRegistry.registerItem(hazmat_cloth, hazmat_cloth.getUnlocalizedName());
|
||||
@ -6151,8 +6146,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(component_emitter, component_emitter.getUnlocalizedName());
|
||||
|
||||
//Bomb Parts
|
||||
GameRegistry.registerItem(shell, shell.getUnlocalizedName());
|
||||
GameRegistry.registerItem(pipe, pipe.getUnlocalizedName());
|
||||
GameRegistry.registerItem(fins_flat, fins_flat.getUnlocalizedName());
|
||||
GameRegistry.registerItem(fins_small_steel, fins_small_steel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(fins_big_steel, fins_big_steel.getUnlocalizedName());
|
||||
@ -6161,8 +6154,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(sphere_steel, sphere_steel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(pedestal_steel, pedestal_steel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(dysfunctional_reactor, dysfunctional_reactor.getUnlocalizedName());
|
||||
GameRegistry.registerItem(rotor_steel, rotor_steel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(generator_steel, generator_steel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(blade_titanium, blade_titanium.getUnlocalizedName());
|
||||
GameRegistry.registerItem(blade_tungsten, blade_tungsten.getUnlocalizedName());
|
||||
GameRegistry.registerItem(turbine_titanium, turbine_titanium.getUnlocalizedName());
|
||||
|
||||
@ -58,7 +58,7 @@ public class ItemPWRFuel extends ItemEnumMulti {
|
||||
String reset = EnumChatFormatting.RESET + "";
|
||||
|
||||
list.add(color + "Heat per flux: " + reset + num.heatEmission + " TU");
|
||||
list.add(color + "Reacton function: " + reset + num.function.getLabelForFuel());
|
||||
list.add(color + "Reaction function: " + reset + num.function.getLabelForFuel());
|
||||
list.add(color + "Fuel type: " + reset + num.function.getDangerFromFuel());
|
||||
}
|
||||
}
|
||||
|
||||
@ -139,7 +139,7 @@ public class ItemWatzPellet extends ItemEnumMulti {
|
||||
}
|
||||
if(num.heatEmission > 0) list.add(color + "Heat per flux: " + reset + num.heatEmission + " TU");
|
||||
if(num.burnFunc != null) {
|
||||
list.add(color + "Reacton function: " + reset + num.burnFunc.getLabelForFuel());
|
||||
list.add(color + "Reaction function: " + reset + num.burnFunc.getLabelForFuel());
|
||||
list.add(color + "Fuel type: " + reset + num.burnFunc.getDangerFromFuel());
|
||||
}
|
||||
if(num.heatDiv != null) list.add(color + "Thermal multiplier: " + reset + num.heatDiv.getLabelForFuel() + " TU⁻¹");
|
||||
|
||||
@ -97,7 +97,6 @@ public class CraftingManager {
|
||||
addRecipeAuto(Mats.MAT_DURA.make(ModItems.bolt, 16), new Object[] { "D", "D", 'D', DURA.ingot()});
|
||||
addRecipeAuto(new ItemStack(ModItems.bolt_spike, 2), new Object[] { "BB", "B ", "B ", 'B', STEEL.bolt()});
|
||||
addRecipeAuto(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', STEEL.block() });
|
||||
addRecipeAuto(new ItemStack(ModItems.bolt_compound, 1), new Object[] { "PDP", "PTP", "PDP", 'D', DURA.bolt(), 'T', W.bolt(), 'P', TI.plate() });
|
||||
addRecipeAuto(new ItemStack(ModItems.pellet_coal, 1), new Object[] { "PFP", "FOF", "PFP", 'P', COAL.dust(), 'F', Items.flint, 'O', ModBlocks.gravel_obsidian });
|
||||
addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_PLASTIC.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_RUBBER.ingot() });
|
||||
@ -210,8 +209,6 @@ public class CraftingManager {
|
||||
addRecipeAuto(new ItemStack(ModItems.lemon, 1), new Object[] { " D ", "DSD", " D ", 'D', KEY_YELLOW, 'S', "stone" });
|
||||
addRecipeAuto(new ItemStack(ModItems.blade_titanium, 2), new Object[] { "TP", "TP", "TT", 'P', TI.plate(), 'T', TI.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.turbine_titanium, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_titanium, 'S', STEEL.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.rotor_steel, 3), new Object[] { "CCC", "SSS", "CCC", 'C', ModItems.coil_gold, 'S', STEEL.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.generator_steel, 1), new Object[] { "RRR", "CCC", "SSS", 'C', ModItems.coil_gold_torus, 'S', STEEL.ingot(), 'R', ModItems.rotor_steel });
|
||||
addRecipeAuto(new ItemStack(ModItems.shimmer_head, 1), new Object[] { "SSS", "DTD", "SSS", 'S', STEEL.ingot(), 'D', DESH.block(), 'T', W.block() });
|
||||
addRecipeAuto(new ItemStack(ModItems.shimmer_axe_head, 1), new Object[] { "PII", "PBB", "PII", 'P', STEEL.plate(), 'B', DESH.block(), 'I', W.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.shimmer_handle, 1), new Object[] { "GP", "GP", "GP", 'G', GOLD.plate(), 'P', ANY_PLASTIC.ingot() });
|
||||
@ -221,7 +218,7 @@ public class CraftingManager {
|
||||
addShapelessAuto(new ItemStack(ModItems.definitelyfood, 4), new Object[] { ANY_RUBBER.ingot(), Items.wheat, Items.rotten_flesh, Items.wheat_seeds, Items.wheat_seeds, Items.wheat_seeds });
|
||||
addRecipeAuto(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', DURA.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.ring_starmetal, 1), new Object[] { " S ", "S S", " S ", 'S', STAR.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.flywheel_beryllium, 1), new Object[] { "IBI", "BTB", "IBI", 'B', BE.block(), 'I', IRON.plateCast(), 'T', ModItems.bolt_compound });
|
||||
addRecipeAuto(new ItemStack(ModItems.flywheel_beryllium, 1), new Object[] { "IBI", "BTB", "IBI", 'B', BE.block(), 'I', IRON.plateCast(), 'T', DURA.pipe() });
|
||||
|
||||
addShapelessAuto(new ItemStack(ModItems.powder_poison), new Object[] { DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.NIGHTSHADE) });
|
||||
addShapelessAuto(new ItemStack(ModItems.syringe_metal_stimpak), new Object[] { ModItems.syringe_metal_empty, Items.carrot, DictFrame.fromOne(ModBlocks.plant_flower, EnumFlowerType.FOXGLOVE) }); //xander root and broc flower
|
||||
|
||||
@ -1288,6 +1288,9 @@ public class MainRegistry {
|
||||
ignoreMappings.add("hbm:item.gas_biogas");
|
||||
ignoreMappings.add("hbm:item.gas_lpg");
|
||||
ignoreMappings.add("hbm:item.gun_coilgun_ammo");
|
||||
ignoreMappings.add("hbm:item.rotor_steel");
|
||||
ignoreMappings.add("hbm:item.generator_steel");
|
||||
ignoreMappings.add("hbm:item.bolt_compound");
|
||||
|
||||
/// REMAP ///
|
||||
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);
|
||||
|
||||
@ -214,28 +214,35 @@ public abstract class RenderPylonBase extends TileEntitySpecialRenderer {
|
||||
public void drawLineSegment(Tessellator tessellator, double x, double y, double z, double a, double b, double c) {
|
||||
|
||||
double girth = 0.03125D;
|
||||
|
||||
double dX = x - a;
|
||||
double dY = y - b;
|
||||
double dZ = z - c;
|
||||
double length = Math.sqrt(dX * dX + dY * dY + dZ * dZ);
|
||||
|
||||
double deltaX = a - x;
|
||||
double deltaY = b - y;
|
||||
double deltaZ = c - z;
|
||||
double hyp = Math.sqrt(deltaX * deltaX + deltaZ * deltaZ);
|
||||
double yaw = Math.atan2(deltaX, deltaZ);
|
||||
double pitch = Math.atan2(deltaY, hyp);
|
||||
double rotator = Math.PI * 0.5D;
|
||||
double newPitch = pitch + rotator;
|
||||
double newYaw = yaw + rotator;
|
||||
double iZ = Math.cos(yaw) * Math.cos(newPitch) * girth;
|
||||
double iX = Math.sin(yaw) * Math.cos(newPitch) * girth;
|
||||
double iY = Math.sin(newPitch) * girth;
|
||||
double jZ = Math.cos(newYaw) * Math.cos(newPitch) * girth;
|
||||
double jX = Math.sin(newYaw) * Math.cos(newPitch) * girth;
|
||||
double length = Math.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ);
|
||||
int wrap = (int) Math.ceil(length * 8);
|
||||
|
||||
if(dX + dZ < 0) wrap *= -1;
|
||||
if(deltaX + deltaZ < 0) wrap *= -1;
|
||||
|
||||
tessellator.setColorOpaque_I(0xffffff);
|
||||
tessellator.addVertexWithUV(x, y + girth, z, 0, 0);
|
||||
tessellator.addVertexWithUV(x, y - girth, z, 0, 1);
|
||||
tessellator.addVertexWithUV(a, b - girth, c, wrap, 1);
|
||||
tessellator.addVertexWithUV(a, b + girth, c, wrap, 0);
|
||||
/*tessellator.addVertex(x + girth, y, z);
|
||||
tessellator.addVertex(x - girth, y, z);
|
||||
tessellator.addVertex(a + girth, b, c);
|
||||
tessellator.addVertex(a - girth, b, c);
|
||||
tessellator.addVertex(x, y, z + girth);
|
||||
tessellator.addVertex(x, y, z - girth);
|
||||
tessellator.addVertex(a, b, c + girth);
|
||||
tessellator.addVertex(a, b, c - girth);*/
|
||||
tessellator.addVertexWithUV(x + iX, y + iY, z + iZ, 0, 0);
|
||||
tessellator.addVertexWithUV(x - iX, y - iY, z - iZ, 0, 1);
|
||||
tessellator.addVertexWithUV(a - iX, b - iY, c - iZ, wrap, 1);
|
||||
tessellator.addVertexWithUV(a + iX, b + iY, c + iZ, wrap, 0);
|
||||
tessellator.addVertexWithUV(x + jX, y, z + jZ, 0, 0);
|
||||
tessellator.addVertexWithUV(x - jX, y, z - jZ, 0, 1);
|
||||
tessellator.addVertexWithUV(a - jX, b, c - jZ, wrap, 1);
|
||||
tessellator.addVertexWithUV(a + jX, b, c + jZ, wrap, 0);
|
||||
}
|
||||
|
||||
public static final int LINE_COLOR = 0xBB3311;
|
||||
|
||||
@ -22,8 +22,8 @@ public class TileEntityCondenserPowered extends TileEntityCondenser implements I
|
||||
|
||||
public TileEntityCondenserPowered() {
|
||||
tanks = new FluidTank[2];
|
||||
tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 100_000);
|
||||
tanks[1] = new FluidTank(Fluids.WATER, 100_000);
|
||||
tanks[0] = new FluidTank(Fluids.SPENTSTEAM, 1_000_000);
|
||||
tanks[1] = new FluidTank(Fluids.WATER, 1_000_000);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -30,9 +30,9 @@ public class ArmorUtil {
|
||||
*/
|
||||
|
||||
public static void register() {
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_LUNG, HazardClass.BACTERIA);
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_LUNG, HazardClass.GAS_BLISTERING, HazardClass.BACTERIA);
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter_mono, HazardClass.PARTICLE_COARSE, HazardClass.GAS_MONOXIDE);
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter_combo, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_LUNG, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE);
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter_combo, HazardClass.PARTICLE_COARSE, HazardClass.PARTICLE_FINE, HazardClass.GAS_LUNG, HazardClass.GAS_BLISTERING, HazardClass.BACTERIA, HazardClass.GAS_MONOXIDE);
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter_rag, HazardClass.PARTICLE_COARSE);
|
||||
ArmorRegistry.registerHazard(ModItems.gas_mask_filter_piss, HazardClass.PARTICLE_COARSE, HazardClass.GAS_LUNG);
|
||||
|
||||
|
||||
@ -2740,6 +2740,7 @@ item.plate_copper.name=Kupferplatte
|
||||
item.plate_dalekanium.name=Wütendes Metall
|
||||
item.plate_desh.name=Desh-Verbundplatte
|
||||
item.plate_dineutronium.name=Dineutronium-Verbundplatte
|
||||
item.plate_dura_steel.name=Schnellarbeitsstahlplatte
|
||||
item.plate_euphemium.name=Euphemium-Verbundplatte
|
||||
item.plate_gold.name=Goldplatte
|
||||
item.plate_iron.name=Eisenplatte
|
||||
@ -3530,7 +3531,7 @@ shape.ingot=Barren
|
||||
shape.nugget=Nugget
|
||||
shape.quantum=Quantum
|
||||
shape.quart=Viertel Block
|
||||
shape.pipe=Rohr
|
||||
shape.ntmpipe=Rohr
|
||||
shape.plate=Platte
|
||||
shape.plateTriple=Gussplatte
|
||||
shape.shell=Mantel
|
||||
@ -4090,6 +4091,7 @@ tile.lantern.name=Laterne
|
||||
tile.lantern_behemoth.name=Alte Laterne
|
||||
tile.launch_pad.name=Silo-Startrampe
|
||||
tile.launch_pad_large.name=Startrampe
|
||||
tile.launch_pad_rusted.name=Alte Startrampe
|
||||
tile.launch_table.name=Große Startrampe
|
||||
tile.leaves_layer.name=Totes Laub
|
||||
tile.lox_barrel.name=LOX-Fass
|
||||
|
||||
@ -3585,6 +3585,7 @@ item.plate_copper.name=Copper Plate
|
||||
item.plate_dalekanium.name=Angry Metal
|
||||
item.plate_desh.name=Desh Compound Plate
|
||||
item.plate_dineutronium.name=Dineutronium Compound Plate
|
||||
item.plate_dura_steel.name=High-Speed Steel Plate
|
||||
item.plate_euphemium.name=Euphemium Compound Plate
|
||||
item.plate_fuel_mox.name=MOX Plate Fuel
|
||||
item.plate_fuel_pu238be.name=Pu238Be Plate Fuel
|
||||
@ -4539,7 +4540,7 @@ shape.ingot=Ingot
|
||||
shape.nugget=Nugget
|
||||
shape.quantum=Quantum
|
||||
shape.quart=Quarter Block
|
||||
shape.pipe=Pipe
|
||||
shape.ntmpipe=Pipe
|
||||
shape.plate=Plate
|
||||
shape.plateTriple=Cast Plate
|
||||
shape.shell=Shell
|
||||
@ -5139,6 +5140,7 @@ tile.lantern.name=Lantern
|
||||
tile.lantern_behemoth.name=Old Lantern
|
||||
tile.launch_pad.name=Silo Launch Pad
|
||||
tile.launch_pad_large.name=Launch Pad
|
||||
tile.launch_pad_rusted.name=Old Launch Pad
|
||||
tile.launch_table.name=Large Launch Pad
|
||||
tile.leaves_layer.name=Fallen Leaves
|
||||
tile.lox_barrel.name=LOX Barrel
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 299 B |
Binary file not shown.
|
Before Width: | Height: | Size: 94 B |
Binary file not shown.
|
Before Width: | Height: | Size: 701 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 664 KiB |
Loading…
x
Reference in New Issue
Block a user