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

military circuits, finished solinium bomb, added kit, recipes

Browse Source
This commit is contained in:
HbmMods 2018-03-21 11:44:03 +01:00
parent 26b5d39153
commit 2d2c1ff323
19 changed files with 90 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/hbm/lang/de_DE.lang
View File

@ -174,6 +174,10 @@ item.fleija_igniter.name=Impulszünder
item.fleija_propellant.name=Schrabidiumtreibladung
item.fleija_core.name=F.L.E.I.J.A. Uran-235-Ladung
item.solinium_igniter.name=SOL-Impulszünder
item.solinium_propellant.name=SOL-Verdichtungsladung
item.solinium_core.name=Semistabiler Soliniumkern
container.nukeGadget=The Gadget
container.nukeBoy=Little Boy
container.nukeMan=Fat Man
@ -182,6 +186,7 @@ container.nukeTsar=Tsar Bombe
container.nukeFleija=F.L.E.I.J.A.
container.nukePrototype=Der Prototyp
container.nukeCustom=Anpassbare Bombe
container.nukeSolinium=Die Blauspülung
container.bombMulti=Mehrzweckbombe
@ -193,6 +198,7 @@ tile.nuke_tsar.name=Tsar Bombe
tile.nuke_fleija.name=F.L.E.I.J.A.
tile.nuke_prototype.name=Der Prototyp
tile.nuke_custom.name=Anpassbare Bombe
tile.nuke_solinium.name=Die Blauspülung
tile.turret_light.name=Leichtes MG-Geschütz
tile.turret_heavy.name=Schweres MG-Geschütz
@ -443,6 +449,8 @@ item.drill_titanium.name=Titanbohrer
item.bolt_tungsten.name=Wolframbolzen
item.bolt_compound.name=Verstärkte Turbinenwelle
item.plate_polymer.name=Isolator
item.ingot_solinium.name=Soliniumbarren
item.nugget_solinium.name=Soliniumnugget
item.ingot_australium.name=Australiumbarren
item.ingot_weidanium.name=Weidaniumbarren
@ -492,6 +500,12 @@ item.circuit_copper.name=Erweiterter Schaltkreis
item.circuit_red_copper.name=Forgeschrittener Schaltkreis
item.circuit_gold.name=Übertakteter Schaltkreis
item.circuit_schrabidium.name=Leistungsstarker Schaltkreis
item.circuit_targeting_tier1.name=Militärische Schaltplatte (Stufe 1)
item.circuit_targeting_tier2.name=Militärische Schaltplatte (Stufe 2)
item.circuit_targeting_tier3.name=Militärische Schaltplatte (Stufe 3)
item.circuit_targeting_tier4.name=Militärische Schaltplatte (Stufe 4)
item.circuit_targeting_tier5.name=Militärische Schaltplatte (Stufe 5)
item.circuit_targeting_tier6.name=Militärische Schaltplatte (Stufe 6)
tile.block_aluminium.name=Aluminiumblock
tile.block_copper.name=Kupferblock
@ -635,6 +649,9 @@ item.powder_niobium_tiny.name=Kleiner Haufen Niobstaub
item.powder_cerium_tiny.name=Kleiner Haufen Cerstaub
item.powder_lanthanium_tiny.name=Kleiner Haufen Lanthanstaub
item.powder_actinium_tiny.name=Kleiner Haufen Actiniumstaub
item.powder_euphemium.name=Euphemiumstaub
item.powder_meteorite.name=Meteoritenstaub
item.powder_meteorite_tiny.name=Kleiner Haufen Meteoritenstaub
item.powder_yellowcake.name=Yellowcake
item.powder_magic.name=Pulverisierte Verzauberung
@ -887,6 +904,7 @@ item.prototype_kit.name=Prototyp Kit
item.missile_kit.name=Raketen Kit
item.t45_kit.name=T45-Powerrüstungskit
item.euphemium_kit.name=Euphemium Kit
item.solinium_kit.name=Solinium Kit
tile.waste_earth.name=Totes Gras
tile.waste_trinitite.name=Trinititerz

15
assets/hbm/lang/en_US.lang
View File

@ -174,6 +174,10 @@ item.fleija_igniter.name=Pulse Igniter
item.fleija_propellant.name=Schrabidium Propellant
item.fleija_core.name=F.L.E.I.J.A. Uranium 235 Charge
item.solinium_igniter.name=SOL Pulse Igniter
item.solinium_propellant.name=SOL Compression Charge
item.solinium_core.name=Semistable Solinium Core
container.nukeGadget=The Gadget
container.nukeBoy=Little Boy
container.nukeMan=Fat Man
@ -182,6 +186,7 @@ container.nukeTsar=Tsar Bomba
container.nukeFleija=F.L.E.I.J.A.
container.nukePrototype=The Prototype
container.nukeCustom=Custom Nuke
container.nukeSolinium=The Blue Rinse
container.bombMulti=Multi Purpose Bomb
@ -193,6 +198,7 @@ tile.nuke_tsar.name=Tsar Bomba
tile.nuke_fleija.name=F.L.E.I.J.A.
tile.nuke_prototype.name=The Prototype
tile.nuke_custom.name=Custom Nuke
tile.nuke_solinium.name=The Blue Rinse
tile.bomb_multi.name=Multi Purpose Bomb
tile.rejuvinator.name=Rejuvination Device
@ -443,6 +449,8 @@ item.drill_titanium.name=Titanium Drill
item.bolt_tungsten.name=Tunsten Bolt
item.bolt_compound.name=Reinforced Turbine Shaft
item.plate_polymer.name=Insulator
item.ingot_solinium.name=Solinium Ingot
item.nugget_solinium.name=Solinium Nugget
item.ingot_australium.name=Australium Ingot
item.ingot_weidanium.name=Weidanium Ingot
@ -492,6 +500,12 @@ item.circuit_copper.name=Enhanced Circuit
item.circuit_red_copper.name=Advanved Circuit
item.circuit_gold.name=Overclocked Circuit
item.circuit_schrabidium.name=High Performance Circuit
item.circuit_targeting_tier1.name=Military Grade Circuit Board (Tier 1)
item.circuit_targeting_tier2.name=Military Grade Circuit Board (Tier 2)
item.circuit_targeting_tier3.name=Military Grade Circuit Board (Tier 3)
item.circuit_targeting_tier4.name=Military Grade Circuit Board (Tier 4)
item.circuit_targeting_tier5.name=Military Grade Circuit Board (Tier 5)
item.circuit_targeting_tier6.name=Military Grade Circuit Board (Tier 6)
tile.block_aluminium.name=Block of Aluminium
tile.block_copper.name=Block of Copper
@ -890,6 +904,7 @@ item.prototype_kit.name=Prototype Kit
item.missile_kit.name=Missile Kit
item.t45_kit.name=T45 Power Armor Kit
item.euphemium_kit.name=Euphemium Kit
item.solinium_kit.name=Solinium Kit
tile.waste_earth.name=Dead Grass
tile.waste_trinitite.name=Trinitite Ore

BIN
assets/hbm/textures/blocks/nuke_solinium.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

BIN
assets/hbm/textures/items/circuit_targeting_tier1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 332 B

BIN
assets/hbm/textures/items/circuit_targeting_tier2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 366 B

BIN
assets/hbm/textures/items/circuit_targeting_tier3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 334 B

BIN
assets/hbm/textures/items/circuit_targeting_tier4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 341 B

BIN
assets/hbm/textures/items/circuit_targeting_tier5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 343 B

BIN
assets/hbm/textures/items/circuit_targeting_tier6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 351 B

BIN
assets/hbm/textures/items/solinium_kit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 252 B

BIN
assets/hbm/textures/models/ufp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

2
com/hbm/handler/FuelHandler.java
View File

@ -15,7 +15,7 @@ public class FuelHandler implements IFuelHandler {
if(fuel.getItem().equals(ModItems.solid_fuel))
return 3200;
if(fuel.getItem().equals(ModItems.biomass_compressed))
return 8000;
return 800;
if(fuel.getItem().equals(ModItems.powder_coal))
return 1600;
if(fuel.getItem().equals(ModItems.scrap))

24
com/hbm/items/ModItems.java
View File

@ -271,6 +271,13 @@ public class ModItems {
public static Item circuit_gold;
public static Item circuit_schrabidium;
public static Item circuit_targeting_tier1;
public static Item circuit_targeting_tier2;
public static Item circuit_targeting_tier3;
public static Item circuit_targeting_tier4;
public static Item circuit_targeting_tier5;
public static Item circuit_targeting_tier6;
public static Item wiring_red_copper;
public static Item cap_aluminium;
@ -1046,6 +1053,7 @@ public class ModItems {
public static Item missile_kit;
public static Item t45_kit;
public static Item euphemium_kit;
public static Item solinium_kit;
public static Item clip_revolver_iron;
public static Item clip_revolver;
@ -1496,6 +1504,12 @@ public class ModItems {
circuit_red_copper = new Item().setUnlocalizedName("circuit_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_red_copper");
circuit_gold = new Item().setUnlocalizedName("circuit_gold").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_gold");
circuit_schrabidium = new ItemCustomLore().setUnlocalizedName("circuit_schrabidium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_schrabidium");
circuit_targeting_tier1 = new Item().setUnlocalizedName("circuit_targeting_tier1").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_targeting_tier1");
circuit_targeting_tier2 = new Item().setUnlocalizedName("circuit_targeting_tier2").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_targeting_tier2");
circuit_targeting_tier3 = new Item().setUnlocalizedName("circuit_targeting_tier3").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_targeting_tier3");
circuit_targeting_tier4 = new Item().setUnlocalizedName("circuit_targeting_tier4").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_targeting_tier4");
circuit_targeting_tier5 = new Item().setUnlocalizedName("circuit_targeting_tier5").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_targeting_tier5");
circuit_targeting_tier6 = new Item().setUnlocalizedName("circuit_targeting_tier6").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":circuit_targeting_tier6");
wiring_red_copper = new ItemWiring().setUnlocalizedName("wiring_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":wiring_red_copper");
@ -2025,6 +2039,7 @@ public class ModItems {
missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":missile_kit");
t45_kit = new ItemStarterKit().setUnlocalizedName("t45_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":t45_kit");
euphemium_kit = new ItemStarterKit().setUnlocalizedName("euphemium_kit").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":code");
solinium_kit = new ItemStarterKit().setUnlocalizedName("solinium_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":solinium_kit");
clip_revolver_iron = new ItemClip().setUnlocalizedName("clip_revolver_iron").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver_iron");
clip_revolver = new ItemClip().setUnlocalizedName("clip_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":clip_revolver");
@ -2668,6 +2683,14 @@ public class ModItems {
GameRegistry.registerItem(circuit_gold, circuit_gold.getUnlocalizedName());
GameRegistry.registerItem(circuit_schrabidium, circuit_schrabidium.getUnlocalizedName());
//Military Circuits
GameRegistry.registerItem(circuit_targeting_tier1, circuit_targeting_tier1.getUnlocalizedName());
GameRegistry.registerItem(circuit_targeting_tier2, circuit_targeting_tier2.getUnlocalizedName());
GameRegistry.registerItem(circuit_targeting_tier3, circuit_targeting_tier3.getUnlocalizedName());
GameRegistry.registerItem(circuit_targeting_tier4, circuit_targeting_tier4.getUnlocalizedName());
GameRegistry.registerItem(circuit_targeting_tier5, circuit_targeting_tier5.getUnlocalizedName());
GameRegistry.registerItem(circuit_targeting_tier6, circuit_targeting_tier6.getUnlocalizedName());
//Wiring
GameRegistry.registerItem(wiring_red_copper, wiring_red_copper.getUnlocalizedName());
@ -3474,6 +3497,7 @@ public class ModItems {
GameRegistry.registerItem(tsar_kit, tsar_kit.getUnlocalizedName());
GameRegistry.registerItem(prototype_kit, prototype_kit.getUnlocalizedName());
GameRegistry.registerItem(fleija_kit, fleija_kit.getUnlocalizedName());
GameRegistry.registerItem(solinium_kit, solinium_kit.getUnlocalizedName());
GameRegistry.registerItem(multi_kit, multi_kit.getUnlocalizedName());
GameRegistry.registerItem(missile_kit, missile_kit.getUnlocalizedName());
GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName());

5
com/hbm/items/special/ItemCustomLore.java
View File

@ -578,6 +578,11 @@ public class ItemCustomLore extends ItemRadioactive {
{
list.add("...it emits an energy-beam thingy.");
}
if(this == ModItems.canister_fuel)
{
list.add("All hail the spout!");
}
}
@Override

14
com/hbm/items/special/ItemStarterKit.java
View File

@ -272,6 +272,20 @@ public class ItemStarterKit extends Item {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.fleija_core, 1));
}
if(this == ModItems.solinium_kit)
{
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_solinium), 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_igniter, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_igniter, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_igniter, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_igniter, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_propellant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_propellant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_propellant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_propellant, 1));
player.inventory.addItemStackToInventory(new ItemStack(ModItems.solinium_core, 1));
}
if(this == ModItems.prototype_kit)
{
player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_prototype), 1));

6
com/hbm/main/CraftingManager.java
View File

@ -75,6 +75,12 @@ public class CraftingManager {
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_red_copper, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_copper, 'R', "dustGold", 'A', ModItems.wire_red_copper }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_gold, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_red_copper, 'R', "dustLapis", 'A', ModItems.wire_gold }));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_schrabidium, 1), new Object[] { "RAR", "ASA", "RAR", 'S', ModItems.circuit_gold, 'R', "dustDiamond", 'A', ModItems.wire_schrabidium }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier1, 1), new Object[] { "CPC", 'C', ModItems.circuit_aluminium, 'P', "dustRedstone" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier2, 1), new Object[] { "CPC", 'C', ModItems.circuit_copper, 'P', "dustNetherQuartz" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier3, 1), new Object[] { "CPC", 'C', ModItems.circuit_red_copper, 'P', "dustGold" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier4, 1), new Object[] { "CPC", 'C', ModItems.circuit_gold, 'P', "dustLapis" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.circuit_targeting_tier5, 1), new Object[] { "CPC", 'C', ModItems.circuit_schrabidium, 'P', "dustDiamond" }));
GameRegistry.addRecipe(new ItemStack(ModItems.circuit_targeting_tier6, 1), new Object[] { "P", "D", "C", 'C', ModItems.circuit_targeting_tier5, 'D', ModItems.battery_potatos, 'P', ModItems.powder_spark_mix });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "salpeter", Items.coal }));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "sulfur", "salpeter", new ItemStack(Items.coal, 1, 1) }));

3
com/hbm/main/ResourceManager.java
View File

@ -116,6 +116,9 @@ public class ResourceManager {
//Radar
public static final ResourceLocation radar_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radar_base.png");
public static final ResourceLocation radar_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radar_head.png");
//Bombs
public static final ResourceLocation bomb_solinium_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ufp.png");

3
com/hbm/render/tileentity/RenderNukeCustom.java
View File

@ -28,6 +28,7 @@ public class RenderNukeCustom extends TileEntitySpecialRenderer {
GL11.glPushMatrix();
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_CULL_FACE);
switch(tileEntity.getBlockMetadata())
{
case 2:
@ -46,6 +47,8 @@ public class RenderNukeCustom extends TileEntitySpecialRenderer {
bindTexture(boyTexture);
boyModel.renderAll();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}

2
com/hbm/render/tileentity/RenderNukeSolinium.java
View File

@ -37,7 +37,7 @@ public class RenderNukeSolinium extends TileEntitySpecialRenderer {
GL11.glRotatef(0, 0F, 1F, 0F); break;
}
bindTexture(ResourceManager.universal);
bindTexture(ResourceManager.bomb_solinium_tex);
ResourceManager.bomb_solinium.renderAll();
GL11.glEnable(GL11.GL_CULL_FACE);