diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index 9106e78e7..b678a0537 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -337,10 +337,12 @@ item.ammo_20gauge_slug.name=Kaliber 20 Brenneke item.ammo_20gauge_wither.name=Kaliber 20 Schrot (Wither) item.ammo_22lr.name=.22 lfB Patrone item.ammo_22lr_ap.name=.22 lfB Patrone (Panzerbrechend) +item.ammo_22lr_chlorophyte.name=.22 lfB Patrone (Grünalgen) item.ammo_357_desh.name=.357 Magnum Deshkugel item.ammo_44.name=.44 Magnum Patrone item.ammo_44_ap.name=.44 Magnum Patrone (Panzerbrechend) item.ammo_44_bj.name=.44 Magnum Patrone (Boot) +item.ammo_44_chlorophyte.name=.44 Magnum Patrone (Grünalgen) item.ammo_44_du.name=.44 Magnum Patrone (DU) item.ammo_44_phosphorus.name=.44 Magnum Patrone (WP) item.ammo_44_pip.name=.44 Magnum Patrone (Güterwagon) @@ -349,6 +351,7 @@ item.ammo_44_silver.name=.44 Magnum Patrone (Gebäude) item.ammo_44_star.name=.44 Magnum Patrone (Sternenmetall) item.ammo_4gauge.name=Kaliber 20 Schrot item.ammo_4gauge_balefire.name=23mm Balefire-Granate +item.ammo_4gauge_canister.name=23mm Rakete (Katusche) item.ammo_4gauge_explosive.name=23mm Granate item.ammo_4gauge_flechette.name=Kaliber 4 Flechet item.ammo_4gauge_flechette_phosphorus.name=Kaliber 4 Flechet (WP) @@ -358,10 +361,12 @@ item.ammo_4gauge_sleek.name=Kaliber 4 Schrot (IF-F&E) item.ammo_4gauge_slug.name=Kaliber 4 Brenneke item.ammo_50ae.name=.50 AE Patrone item.ammo_50ae_ap.name=.50 AE Patrone (Panzerbrechend) +item.ammo_50ae_chlorophyte.name=.50 AE Patrone (Grünalgen) item.ammo_50ae_du.name=.50 AE Patrone (DU) item.ammo_50ae_star.name=.50 AE Patrone (Sternenmetall) item.ammo_50bmg.name=.50 BMG Patrone -item.ammo_50bmg_ap.name=.50 BMG Patrone (AP) +item.ammo_50bmg_ap.name=.50 BMG Patrone (Panzerbrechend) +item.ammo_50bmg_chlorophyte.name=.50 BMG Patrone (Grünalgen) item.ammo_50bmg_du.name=.50 BMG Patrone (DU) item.ammo_50bmg_explosive.name=.50 BMG Patrone (Explosiv) item.ammo_50bmg_incendiary.name=.50 BMG Patrone (Brand) @@ -369,9 +374,11 @@ item.ammo_50bmg_phosphorus.name=.50 BMG Patrone (WP) item.ammo_50bmg_sleek.name=.50 BMG Patrone (IF-F&E) item.ammo_50bmg_star.name=.50 BMG Patrone (Sternenmetall) item.ammo_556.name=5.56mm Patrone -item.ammo_556_ap.name=5.56mm Patrone (AP) +item.ammo_556_ap.name=5.56mm Patrone (Panzerbrechend) +item.ammo_556_chlorophyte.name=5.56mm Patrone (Grünalgen) item.ammo_556_du.name=5.56mm Patrone (DU) -item.ammo_556_flechette.name=5.56mm Patrone (Flechet) +item.ammo_556_flechette.name=5.56mm Flechetpatrone +item.ammo_556_flechette_chlorophyte.name=5.56mm Flechetpatrone (Grünalgen) item.ammo_556_flechette_du.name=5.56mm Flechetpatrone (Uran-Penetrator) item.ammo_556_flechette_incendiary.name=5.56mm Flechetpatrone (Brand) item.ammo_556_flechette_phosphorus.name=5.56mm Flechetpatrone (Phosphorspitze) @@ -382,11 +389,13 @@ item.ammo_556_sleek.name=5.56mm Patrone (IF-F&E) item.ammo_556_star.name=5.56mm Patrone (Sternenmetall) item.ammo_556_tracer.name=5.56mm Patrone (Leuchtspur) item.ammo_5mm.name=5mm Patrone +item.ammo_5mm_chlorophyte.name=5mm Patrone (Grünalgen) item.ammo_5mm_du.name=5mm Patrone (DU) item.ammo_5mm_explosive.name=5mm Patrone (Explosiv) item.ammo_5mm_star.name=5mm Patrone (Sternenmetall) item.ammo_9mm.name=9mm Patrone item.ammo_9mm_ap.name=9mm Patrone (Panzerbrechend) +item.ammo_9mm_chlorophyte.name=9mm Patrone (Grünalgen) item.ammo_9mm_du.name=9mm Patrone (DU) item.ammo_9mm_rocket.name=9mm Rakete item.ammo_cell.name=Energiezelle @@ -411,6 +420,7 @@ item.ammo_grenade_sleek.name=40mm Granate (IF-F&E) item.ammo_grenade_toxic.name=40mm Granate (Chemisch) item.ammo_grenade_tracer.name=40mm Übungsgranate item.ammo_rocket.name=84mm Rakete +item.ammo_rocket_canister.name=84mm Rakete (Katusche) item.ammo_rocket_emp.name=84mm Rakete (Impuls) item.ammo_rocket_glare.name=84mm Rakete (Roter Schein) item.ammo_rocket_he.name=84mm Rakete (HE) @@ -1421,6 +1431,9 @@ item.pellet_advanced.name=Fortgeschrittenes Watzaufwertugspellet item.pellet_antimatter.name=Antimateriencluster item.pellet_beryllium.name=Beryllium-Moderatonspellet item.pellet_buckshot.name=Schrotkugeln +item.pellet_canister.name=Kartuschenkugeln +item.pellet_charged.name=Ionisierte Partikel +item.pellet_chlorophyte.name=Günalgenkugeln item.pellet_cluster.name=Explosive Pellets item.pellet_coal.name=Dichter Kohlecluster item.pellet_coolant.name=Kühlcluster @@ -1429,7 +1442,9 @@ item.pellet_gas.name=Giftgaskatusche item.pellet_hes.name=HES-Watzpellet item.pellet_lead.name=Bleireflektorpellet item.pellet_les.name=LES-Watzpellet +item.pellet_mercury.name=Quecksilberkugeln item.pellet_mes.name=MES-Watzpellet +item.pellet_meteorite.name=Meteoritenkugeln item.pellet_neptunium.name=Neptunium-Watzpellet item.pellet_rtg.name=Plutonium 238 Pellet item.pellet_rtg_weak.name=Schwaches Uran RTG-Pellet diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 0d5a29f06..28222fb3f 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -337,10 +337,12 @@ item.ammo_20gauge_slug.name=20 Gauge Brenneke Slug item.ammo_20gauge_wither.name=20 Gauge Buckshot (Withering) item.ammo_22lr.name=.22 LR Round item.ammo_22lr_ap.name=.22 LR Round (Armor Piercing) +item.ammo_22lr_chlorophyte.name=.22 LR Round (Chlorophyte) item.ammo_357_desh.name=.357 Magnum Desh Bullet item.ammo_44.name=.44 Magnum Bullet item.ammo_44_ap.name=.44 Magnum Bullet (Armor Piercing) item.ammo_44_bj.name=.44 Magnum Bullet (Boat) +item.ammo_44_chlorophyte.name=.44 Magnum Bullet (Chlorophyte) item.ammo_44_du.name=.44 Magnum Bullet (DU) item.ammo_44_phosphorus.name=.44 Magnum Bullet (WP) item.ammo_44_pip.name=.44 Magnum Bullet (Boxcar) @@ -349,6 +351,7 @@ item.ammo_44_silver.name=.44 Magnum Bullet (Building) item.ammo_44_star.name=.44 Magnum Bullet (Starmetal) item.ammo_4gauge.name=4 Gauge Buckshot item.ammo_4gauge_balefire.name=23mm Balefire Grenade +item.ammo_4gauge_canister.name=23mm Rocket (Canister Shot) item.ammo_4gauge_explosive.name=23mm Grenade item.ammo_4gauge_flechette.name=4 Gauge Flechette Shell item.ammo_4gauge_flechette_phosphorus.name=4 Gauge Flechette Shell (WP) @@ -358,10 +361,12 @@ item.ammo_4gauge_sleek.name=4 Gauge Buckshot (IF-R&D) item.ammo_4gauge_slug.name=4 Gauge Solid Steel Slug item.ammo_50ae.name=.50 AE Round item.ammo_50ae_ap.name=.50 AE Round (Armor Piercing) +item.ammo_50ae_chlorophyte.name=.50 AE Round (Chlorophyte) item.ammo_50ae_du.name=.50 AE Round (DU) item.ammo_50ae_star.name=.50 AE Round (Starmetal) item.ammo_50bmg.name=.50 BMG Round -item.ammo_50bmg_ap.name=.50 BMG Round (AP) +item.ammo_50bmg_ap.name=.50 BMG Round (Armor Piercing) +item.ammo_50bmg_chlorophyte.name=.50 BMG Round (Chlorophyte) item.ammo_50bmg_du.name=.50 BMG Round (DU) item.ammo_50bmg_explosive.name=.50 BMG Round (Explosive) item.ammo_50bmg_incendiary.name=.50 BMG Round (Incendiary) @@ -369,9 +374,11 @@ item.ammo_50bmg_phosphorus.name=.50 BMG Round (WP) item.ammo_50bmg_sleek.name=.50 BMG Round (IF-R&D) item.ammo_50bmg_star.name=.50 BMG Round (Starmetal) item.ammo_556.name=5.56mm Round -item.ammo_556_ap.name=5.56mm Round (AP) +item.ammo_556_ap.name=5.56mm Round (Armor Piercing) +item.ammo_556_chlorophyte.name=5.56mm Round (Chlorophyte) item.ammo_556_du.name=5.56mm Round (DU) item.ammo_556_flechette.name=5.56mm Flechette Round +item.ammo_556_flechette_chlorophyte.name=5.56mm Flechette Round (Chlorophyte) item.ammo_556_flechette_du.name=5.56mm Flechette Round (Uranium Penetrator) item.ammo_556_flechette_incendiary.name=5.56mm Flechette Round (Incendiary) item.ammo_556_flechette_phosphorus.name=5.56mm Flechette Round (Phosphorus-Tipped) @@ -382,11 +389,13 @@ item.ammo_556_sleek.name=5.56mm Round (IF-R&D) item.ammo_556_star.name=5.56mm Round (Starmetal) item.ammo_556_tracer.name=5.56mm Round (Tracer) item.ammo_5mm.name=5mm Round +item.ammo_5mm_chlorophyte.name=5mm Round (Chlorophyte) item.ammo_5mm_du.name=5mm Round (DU) item.ammo_5mm_explosive.name=5mm Round (Explosive) item.ammo_5mm_star.name=5mm Round (Starmetal) item.ammo_9mm.name=9mm Round item.ammo_9mm_ap.name=9mm Round (Armor Piercing) +item.ammo_9mm_chlorophyte.name=9mm Round (Chlorophyte) item.ammo_9mm_du.name=9mm Round (DU) item.ammo_9mm_rocket.name=9mm Rocket item.ammo_cell.name=Energy Cell @@ -411,6 +420,7 @@ item.ammo_grenade_sleek.name=40mm Grenade (IF-R&D) item.ammo_grenade_toxic.name=40mm Grenade (Chemical) item.ammo_grenade_tracer.name=40mm Training Grenade item.ammo_rocket.name=84mm Rocket +item.ammo_rocket_canister.name=84mm Rocket (Canister Shot) item.ammo_rocket_emp.name=84mm Rocket (Pulse) item.ammo_rocket_glare.name=84mm Rocket (Red Glare) item.ammo_rocket_he.name=84mm Rocket (HE) @@ -1421,6 +1431,9 @@ item.pellet_advanced.name=Advanced Watz Performance Improver item.pellet_antimatter.name=Antimatter Cluster item.pellet_beryllium.name=Beryllium Moderator Pellet item.pellet_buckshot.name=Lead Pellets +item.pellet_canister.name=Canister Shot +item.pellet_charged.name=Ionized Particles +item.pellet_chlorophyte.name=Chlorophyte Rounds item.pellet_cluster.name=Explosive Pellets item.pellet_coal.name=Dense Coal Cluster item.pellet_coolant.name=Coolant Cluster @@ -1429,7 +1442,9 @@ item.pellet_gas.name=Poison Gas Cartridge item.pellet_hes.name=HES Watz Pellet item.pellet_lead.name=Lead Reflector Pellet item.pellet_les.name=LES Watz Pellet +item.pellet_mercury.name=Mercury Rounds item.pellet_mes.name=MES Watz Pellet +item.pellet_meteorite.name=Meteorite Rounds item.pellet_neptunium.name=Neptunium Watz Pellet item.pellet_rtg.name=Plutonium 238 Fuel Pellet item.pellet_rtg_weak.name=Weak Uranium RTG Pellet diff --git a/src/main/java/assets/hbm/textures/blocks/brick_jungle_circle.png b/src/main/java/assets/hbm/textures/blocks/brick_jungle_circle.png new file mode 100644 index 000000000..d0dac5587 Binary files /dev/null and b/src/main/java/assets/hbm/textures/blocks/brick_jungle_circle.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_22lr_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_22lr_chlorophyte.png new file mode 100644 index 000000000..9001c86cc Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_22lr_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_44_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_44_chlorophyte.png new file mode 100644 index 000000000..47d8b75ec Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_44_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_50ae_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_50ae_chlorophyte.png new file mode 100644 index 000000000..508c838f3 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_50ae_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_50bmg_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_50bmg_chlorophyte.png new file mode 100644 index 000000000..6bfa27058 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_50bmg_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_556_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_556_chlorophyte.png new file mode 100644 index 000000000..0a847444d Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_556_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_556_flechette_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_556_flechette_chlorophyte.png new file mode 100644 index 000000000..be9ab1a8c Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_556_flechette_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_5mm_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_5mm_chlorophyte.png new file mode 100644 index 000000000..6199867e9 Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_5mm_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/ammo_9mm_chlorophyte.png b/src/main/java/assets/hbm/textures/items/ammo_9mm_chlorophyte.png new file mode 100644 index 000000000..333ef997c Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/ammo_9mm_chlorophyte.png differ diff --git a/src/main/java/assets/hbm/textures/items/megaton_hammer.png b/src/main/java/assets/hbm/textures/items/megaton_hammer.png new file mode 100644 index 000000000..04c3dd9cb Binary files /dev/null and b/src/main/java/assets/hbm/textures/items/megaton_hammer.png differ diff --git a/src/main/java/com/hbm/inventory/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/AssemblerRecipes.java index dcb8ac3a5..9ec3a562b 100644 --- a/src/main/java/com/hbm/inventory/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/AssemblerRecipes.java @@ -206,18 +206,18 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.pellet_rtg, 1), new AStack[] {new ComparableStack(ModItems.nugget_pu238, 5), new OreDictStack("plateIron", 2), },50); makeRecipe(new ComparableStack(ModItems.pellet_rtg_weak, 1), new AStack[] {new ComparableStack(ModItems.nugget_u238, 4), new ComparableStack(ModItems.nugget_pu238, 1), new OreDictStack("plateIron", 2), },50); makeRecipe(new ComparableStack(ModItems.tritium_deuterium_cake, 1), new AStack[] {new ComparableStack(ModItems.cell_deuterium, 6), new ComparableStack(ModItems.cell_tritium, 2), new ComparableStack(ModItems.lithium, 4), },150); - makeRecipe(new ComparableStack(ModItems.pellet_cluster, 1), new AStack[] {new OreDictStack("plateSteel", 4), new ComparableStack(Blocks.tnt, 1), },50); - makeRecipe(new ComparableStack(ModItems.pellet_buckshot, 1), new AStack[] {new ComparableStack(ModItems.nugget_lead, 6), },50); + makeRecipe(new ComparableStack(ModItems.pellet_cluster, 1), new AStack[] {new OreDictStack("plateSteel", 4), new ComparableStack(Blocks.tnt, 1), }, 50); + makeRecipe(new ComparableStack(ModItems.pellet_buckshot, 1), new AStack[] {new ComparableStack(ModItems.nugget_lead, 6), }, 50); makeRecipe(new ComparableStack(ModItems.australium_iii, 1), new AStack[] {new ComparableStack(ModItems.rod_australium, 1), new OreDictStack("ingotSteel", 1), new OreDictStack("plateSteel", 6), new OreDictStack("plateCopper", 2), new ComparableStack(ModItems.wire_copper, 6), },150); makeRecipe(new ComparableStack(ModItems.magnetron, 1), new AStack[] {new ComparableStack(ModItems.ingot_advanced_alloy, 1), new ComparableStack(ModItems.plate_advanced_alloy, 2), new ComparableStack(ModItems.wire_tungsten, 1), new ComparableStack(ModItems.coil_tungsten, 1), },100); - makeRecipe(new ComparableStack(ModItems.pellet_schrabidium, 1), new AStack[] {new ComparableStack(ModItems.ingot_schrabidium, 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_hes, 1), new AStack[] {new ComparableStack(ModItems.ingot_hes, 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_mes, 1), new AStack[] {new ComparableStack(ModItems.ingot_schrabidium_fuel, 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_les, 1), new AStack[] {new ComparableStack(ModItems.ingot_les, 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_beryllium, 1), new AStack[] {new ComparableStack(ModItems.ingot_beryllium, 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_neptunium, 1), new AStack[] {new ComparableStack(ModItems.ingot_neptunium, 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_lead, 1), new AStack[] {new OreDictStack("ingotLead", 5), new OreDictStack("plateIron", 2), },200); - makeRecipe(new ComparableStack(ModItems.pellet_advanced, 1), new AStack[] {new OreDictStack("ingotDesh", 5), new OreDictStack("plateIron", 2), },200); + makeRecipe(new ComparableStack(ModItems.pellet_schrabidium, 1), new AStack[] {new ComparableStack(ModItems.ingot_schrabidium, 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_hes, 1), new AStack[] {new ComparableStack(ModItems.ingot_hes, 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_mes, 1), new AStack[] {new ComparableStack(ModItems.ingot_schrabidium_fuel, 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_les, 1), new AStack[] {new ComparableStack(ModItems.ingot_les, 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_beryllium, 1), new AStack[] {new ComparableStack(ModItems.ingot_beryllium, 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_neptunium, 1), new AStack[] {new ComparableStack(ModItems.ingot_neptunium, 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_lead, 1), new AStack[] {new OreDictStack("ingotLead", 5), new OreDictStack("plateIron", 2), }, 200); + makeRecipe(new ComparableStack(ModItems.pellet_advanced, 1), new AStack[] {new OreDictStack("ingotDesh", 5), new OreDictStack("plateIron", 2), }, 200); makeRecipe(new ComparableStack(ModItems.upgrade_template, 1), new AStack[] {new OreDictStack("plateSteel", 1), new OreDictStack("plateIron", 4), new OreDictStack("plateCopper", 2), new ComparableStack(ModItems.wire_copper, 6), },100); makeRecipe(new ComparableStack(ModItems.upgrade_speed_1, 1), new AStack[] {new ComparableStack(ModItems.upgrade_template, 1), new OreDictStack("dustRedCopperAlloy", 4), new ComparableStack(Items.redstone, 6), new ComparableStack(ModItems.wire_red_copper, 4), },200); makeRecipe(new ComparableStack(ModItems.upgrade_speed_2, 1), new AStack[] {new ComparableStack(ModItems.upgrade_speed_1, 1), new OreDictStack("dustRedCopperAlloy", 2), new ComparableStack(Items.redstone, 4), new ComparableStack(ModItems.circuit_red_copper, 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.ingot_polymer, 2), },300); @@ -481,6 +481,22 @@ public class AssemblerRecipes { new ComparableStack(ModItems.pipes_steel, 1), new ComparableStack(ModItems.circuit_aluminium, 1), }, 20); + + makeRecipe(new ComparableStack(ModItems.pellet_chlorophyte, 2), new AStack[] { + new ComparableStack(ModItems.powder_chlorophyte, 1), + new OreDictStack("nuggetLead", 12), + }, 50); + makeRecipe(new ComparableStack(ModItems.pellet_mercury, 2), new AStack[] { + new ComparableStack(ModItems.nugget_mercury, 1), + new OreDictStack("nuggetLead", 12), + }, 50); + makeRecipe(new ComparableStack(ModItems.pellet_meteorite, 2), new AStack[] { + new ComparableStack(ModItems.powder_meteorite, 1), + new OreDictStack("nuggetLead", 12), + }, 50); + makeRecipe(new ComparableStack(ModItems.pellet_canister, 2), new AStack[] { + new OreDictStack("ingotIron", 3), + }, 50); } private static void makeRecipe(ComparableStack out, AStack[] in, int duration) { diff --git a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java b/src/main/java/com/hbm/inventory/CrystallizerRecipes.java index 141b77e2b..a6cd29e52 100644 --- a/src/main/java/com/hbm/inventory/CrystallizerRecipes.java +++ b/src/main/java/com/hbm/inventory/CrystallizerRecipes.java @@ -60,6 +60,7 @@ public class CrystallizerRecipes { recipes.put(new ComparableStack(ModItems.powder_lapis), new ItemStack(Items.dye, 1, 4)); recipes.put(new ComparableStack(ModItems.powder_semtex_mix), new ItemStack(ModItems.ingot_semtex)); recipes.put(new ComparableStack(ModItems.powder_desh_ready), new ItemStack(ModItems.ingot_desh)); + recipes.put(new ComparableStack(ModItems.powder_meteorite), new ItemStack(ModItems.fragment_meteorite, 1)); } public static ItemStack getOutput(ItemStack stack) { diff --git a/src/main/java/com/hbm/inventory/FusionRecipes.java b/src/main/java/com/hbm/inventory/FusionRecipes.java index ea5052cde..446b3a6a2 100644 --- a/src/main/java/com/hbm/inventory/FusionRecipes.java +++ b/src/main/java/com/hbm/inventory/FusionRecipes.java @@ -12,8 +12,11 @@ public class FusionRecipes { public static int getByproductChance(FluidType plasma) { switch(plasma) { - case PLASMA_XM: return 3 * 60 * 20; - case PLASMA_BF: return 10 * 60 * 20; + case PLASMA_DT: return 1200; + case PLASMA_HD: return 1200; + case PLASMA_HT: return 1200; + case PLASMA_XM: return 3600; + case PLASMA_BF: return 1200; default: return 0; } } @@ -33,7 +36,10 @@ public class FusionRecipes { public static ItemStack getByproduct(FluidType plasma) { switch(plasma) { - case PLASMA_XM: return new ItemStack(ModItems.powder_chlorophyte); + case PLASMA_DT: return new ItemStack(ModItems.pellet_charged); + case PLASMA_HD: return new ItemStack(ModItems.pellet_charged); + case PLASMA_HT: return new ItemStack(ModItems.pellet_charged); + case PLASMA_XM: return new ItemStack(ModItems.powder_chlorophyte); case PLASMA_BF: return new ItemStack(ModItems.powder_balefire); default: return null; } @@ -55,8 +61,11 @@ public class FusionRecipes { HashMap map = new HashMap(); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_XM.ordinal()), new ItemStack(ModItems.powder_chlorophyte)); - map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_BF.ordinal()), new ItemStack(ModItems.powder_balefire)); + map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_DT.ordinal()), getByproduct(FluidType.PLASMA_DT)); + map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_HD.ordinal()), getByproduct(FluidType.PLASMA_HD)); + map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_HT.ordinal()), getByproduct(FluidType.PLASMA_HT)); + map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_XM.ordinal()), getByproduct(FluidType.PLASMA_XM)); + map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_BF.ordinal()), getByproduct(FluidType.PLASMA_BF)); return map; } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 8fadba783..672529a61 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1117,6 +1117,7 @@ public class ModItems { public static Item ammo_4gauge_semtex; public static Item ammo_4gauge_balefire; public static Item ammo_4gauge_kampf; + public static Item ammo_4gauge_canister; public static Item ammo_4gauge_sleek; public static Item ammo_357_desh; public static Item ammo_44; @@ -1124,6 +1125,7 @@ public class ModItems { public static Item ammo_44_du; public static Item ammo_44_phosphorus; public static Item ammo_44_star; + public static Item ammo_44_chlorophyte; public static Item ammo_44_pip; public static Item ammo_44_bj; public static Item ammo_44_silver; @@ -1132,9 +1134,11 @@ public class ModItems { public static Item ammo_5mm_explosive; public static Item ammo_5mm_du; public static Item ammo_5mm_star; + public static Item ammo_5mm_chlorophyte; public static Item ammo_9mm; public static Item ammo_9mm_ap; public static Item ammo_9mm_du; + public static Item ammo_9mm_chlorophyte; public static Item ammo_9mm_rocket; public static Item ammo_556; public static Item ammo_566_gold; @@ -1142,20 +1146,24 @@ public class ModItems { public static Item ammo_556_ap; public static Item ammo_556_du; public static Item ammo_556_star; + public static Item ammo_556_chlorophyte; public static Item ammo_556_sleek; public static Item ammo_556_tracer; public static Item ammo_556_flechette; public static Item ammo_556_flechette_incendiary; public static Item ammo_556_flechette_phosphorus; public static Item ammo_556_flechette_du; + public static Item ammo_556_flechette_chlorophyte; public static Item ammo_556_flechette_sleek; public static Item ammo_556_k; public static Item ammo_22lr; public static Item ammo_22lr_ap; + public static Item ammo_22lr_chlorophyte; public static Item ammo_50ae; public static Item ammo_50ae_ap; public static Item ammo_50ae_du; public static Item ammo_50ae_star; + public static Item ammo_50ae_chlorophyte; public static Item ammo_50bmg; public static Item ammo_50bmg_incendiary; public static Item ammo_50bmg_phosphorus; @@ -1163,6 +1171,7 @@ public class ModItems { public static Item ammo_50bmg_ap; public static Item ammo_50bmg_du; public static Item ammo_50bmg_star; + public static Item ammo_50bmg_chlorophyte; public static Item ammo_50bmg_sleek; public static Item ammo_folly; public static Item ammo_folly_nuclear; @@ -1175,6 +1184,7 @@ public class ModItems { public static Item ammo_rocket_emp; public static Item ammo_rocket_glare; public static Item ammo_rocket_toxic; + public static Item ammo_rocket_canister; public static Item ammo_rocket_sleek; public static Item ammo_rocket_nuclear; public static Item ammo_rocket_rpc; @@ -2966,32 +2976,38 @@ public class ModItems { ammo_4gauge_semtex = new ItemAmmo().setUnlocalizedName("ammo_4gauge_semtex").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_semtex"); ammo_4gauge_balefire = new ItemAmmo().setUnlocalizedName("ammo_4gauge_balefire").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_balefire"); ammo_4gauge_kampf = new ItemAmmo().setUnlocalizedName("ammo_4gauge_kampf").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_kampf"); + ammo_4gauge_canister = new ItemAmmo().setUnlocalizedName("ammo_4gauge_canister").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_canister"); ammo_4gauge_sleek = new ItemAmmo().setUnlocalizedName("ammo_4gauge_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_4gauge_sleek"); ammo_5mm = new ItemAmmo().setUnlocalizedName("ammo_5mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm"); ammo_5mm_explosive = new ItemAmmo().setUnlocalizedName("ammo_5mm_explosive").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_explosive"); ammo_5mm_du = new ItemAmmo().setUnlocalizedName("ammo_5mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_du"); ammo_5mm_star = new ItemAmmo().setUnlocalizedName("ammo_5mm_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_star"); + ammo_5mm_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_5mm_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_5mm_chlorophyte"); ammo_9mm = new ItemAmmo().setUnlocalizedName("ammo_9mm").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm"); ammo_9mm_ap = new ItemAmmo().setUnlocalizedName("ammo_9mm_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_ap"); ammo_9mm_du = new ItemAmmo().setUnlocalizedName("ammo_9mm_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_du"); + ammo_9mm_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_9mm_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_chlorophyte"); ammo_9mm_rocket = new ItemAmmo().setUnlocalizedName("ammo_9mm_rocket").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_9mm_rocket"); ammo_556 = new ItemAmmo().setUnlocalizedName("ammo_556").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556"); ammo_556_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_556_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_phosphorus"); ammo_556_ap = new ItemAmmo().setUnlocalizedName("ammo_556_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_ap"); ammo_556_du = new ItemAmmo().setUnlocalizedName("ammo_556_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_du"); ammo_556_star = new ItemAmmo().setUnlocalizedName("ammo_556_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_star"); + ammo_556_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_556_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_chlorophyte"); ammo_556_sleek = new ItemAmmo().setUnlocalizedName("ammo_556_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_sleek"); ammo_556_tracer = new ItemAmmo().setUnlocalizedName("ammo_556_tracer").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_tracer"); ammo_556_flechette = new ItemAmmo().setUnlocalizedName("ammo_556_flechette").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_flechette"); ammo_556_flechette_incendiary = new ItemAmmo().setUnlocalizedName("ammo_556_flechette_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_flechette_incendiary"); ammo_556_flechette_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_556_flechette_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_flechette_phosphorus"); ammo_556_flechette_du = new ItemAmmo().setUnlocalizedName("ammo_556_flechette_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_flechette_du"); + ammo_556_flechette_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_556_flechette_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_flechette_chlorophyte"); ammo_556_flechette_sleek = new ItemAmmo().setUnlocalizedName("ammo_556_flechette_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_flechette_sleek"); ammo_556_k = new ItemAmmo().setUnlocalizedName("ammo_556_k").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_556_k"); ammo_50ae = new ItemAmmo().setUnlocalizedName("ammo_50ae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae"); ammo_50ae_ap = new ItemAmmo().setUnlocalizedName("ammo_50ae_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_ap"); ammo_50ae_du = new ItemAmmo().setUnlocalizedName("ammo_50ae_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_du"); ammo_50ae_star = new ItemAmmo().setUnlocalizedName("ammo_50ae_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_star"); + ammo_50ae_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_50ae_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50ae_chlorophyte"); ammo_50bmg = new ItemAmmo().setUnlocalizedName("ammo_50bmg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg"); ammo_50bmg_incendiary = new ItemAmmo().setUnlocalizedName("ammo_50bmg_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_incendiary"); ammo_50bmg_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_50bmg_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_phosphorus"); @@ -2999,6 +3015,7 @@ public class ModItems { ammo_50bmg_ap = new ItemAmmo().setUnlocalizedName("ammo_50bmg_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_ap"); ammo_50bmg_du = new ItemAmmo().setUnlocalizedName("ammo_50bmg_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_du"); ammo_50bmg_star = new ItemAmmo().setUnlocalizedName("ammo_50bmg_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_star"); + ammo_50bmg_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_50bmg_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_chlorophyte"); ammo_50bmg_sleek = new ItemAmmo().setUnlocalizedName("ammo_50bmg_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_50bmg_sleek"); ammo_357_desh = new ItemAmmo().setUnlocalizedName("ammo_357_desh").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_357_desh"); ammo_44 = new ItemAmmo().setUnlocalizedName("ammo_44").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44"); @@ -3006,12 +3023,14 @@ public class ModItems { ammo_44_du = new ItemAmmo().setUnlocalizedName("ammo_44_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_du"); ammo_44_phosphorus = new ItemAmmo().setUnlocalizedName("ammo_44_phosphorus").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_phosphorus"); ammo_44_star = new ItemAmmo().setUnlocalizedName("ammo_44_star").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_star"); + ammo_44_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_44_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_chlorophyte"); ammo_44_pip = new ItemAmmo().setUnlocalizedName("ammo_44_pip").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_pip"); ammo_44_bj = new ItemAmmo().setUnlocalizedName("ammo_44_bj").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_bj"); ammo_44_silver = new ItemAmmo().setUnlocalizedName("ammo_44_silver").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_silver"); ammo_44_rocket = new ItemAmmo().setUnlocalizedName("ammo_44_rocket").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_44_rocket"); ammo_22lr = new ItemAmmo().setUnlocalizedName("ammo_22lr").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_22lr"); ammo_22lr_ap = new ItemAmmo().setUnlocalizedName("ammo_22lr_ap").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_22lr_ap"); + ammo_22lr_chlorophyte = new ItemAmmo().setUnlocalizedName("ammo_22lr_chlorophyte").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_22lr_chlorophyte"); ammo_folly = new ItemAmmo().setUnlocalizedName("ammo_folly").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_folly"); ammo_folly_nuclear = new ItemAmmo().setUnlocalizedName("ammo_folly_nuclear").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_folly_nuclear"); ammo_folly_du = new ItemAmmo().setUnlocalizedName("ammo_folly_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_folly_du"); @@ -3023,6 +3042,7 @@ public class ModItems { ammo_rocket_emp = new ItemAmmo().setUnlocalizedName("ammo_rocket_emp").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_emp"); ammo_rocket_glare = new ItemAmmo().setUnlocalizedName("ammo_rocket_glare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_glare"); ammo_rocket_toxic = new ItemAmmo().setUnlocalizedName("ammo_rocket_toxic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_toxic"); + ammo_rocket_canister = new ItemAmmo().setUnlocalizedName("ammo_rocket_canister").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_canister"); ammo_rocket_sleek = new ItemAmmo().setUnlocalizedName("ammo_rocket_sleek").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_sleek"); ammo_rocket_nuclear = new ItemAmmo().setUnlocalizedName("ammo_rocket_nuclear").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_nuclear"); ammo_rocket_rpc = new ItemAmmo().setUnlocalizedName("ammo_rocket_rpc").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ammo_rocket_rpc"); @@ -5243,12 +5263,14 @@ public class ModItems { GameRegistry.registerItem(ammo_4gauge_semtex, ammo_4gauge_semtex.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_balefire, ammo_4gauge_balefire.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_kampf, ammo_4gauge_kampf.getUnlocalizedName()); + GameRegistry.registerItem(ammo_4gauge_canister, ammo_4gauge_canister.getUnlocalizedName()); GameRegistry.registerItem(ammo_4gauge_sleek, ammo_4gauge_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_44, ammo_44.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_ap, ammo_44_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_du, ammo_44_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_phosphorus, ammo_44_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_star, ammo_44_star.getUnlocalizedName()); + GameRegistry.registerItem(ammo_44_chlorophyte, ammo_44_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_pip, ammo_44_pip.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_bj, ammo_44_bj.getUnlocalizedName()); GameRegistry.registerItem(ammo_44_silver, ammo_44_silver.getUnlocalizedName()); @@ -5257,9 +5279,11 @@ public class ModItems { GameRegistry.registerItem(ammo_5mm_explosive, ammo_5mm_explosive.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm_du, ammo_5mm_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_5mm_star, ammo_5mm_star.getUnlocalizedName()); + GameRegistry.registerItem(ammo_5mm_chlorophyte, ammo_5mm_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm, ammo_9mm.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm_ap, ammo_9mm_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm_du, ammo_9mm_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_9mm_chlorophyte, ammo_9mm_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_9mm_rocket, ammo_9mm_rocket.getUnlocalizedName()); GameRegistry.registerItem(ammo_556, ammo_556.getUnlocalizedName()); GameRegistry.registerItem(ammo_566_gold, ammo_566_gold.getUnlocalizedName()); @@ -5267,20 +5291,24 @@ public class ModItems { GameRegistry.registerItem(ammo_556_ap, ammo_556_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_du, ammo_556_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_star, ammo_556_star.getUnlocalizedName()); + GameRegistry.registerItem(ammo_556_chlorophyte, ammo_556_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_sleek, ammo_556_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_tracer, ammo_556_tracer.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_flechette, ammo_556_flechette.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_flechette_incendiary, ammo_556_flechette_incendiary.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_flechette_phosphorus, ammo_556_flechette_phosphorus.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_flechette_du, ammo_556_flechette_du.getUnlocalizedName()); + GameRegistry.registerItem(ammo_556_flechette_chlorophyte, ammo_556_flechette_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_flechette_sleek, ammo_556_flechette_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_556_k, ammo_556_k.getUnlocalizedName()); GameRegistry.registerItem(ammo_22lr, ammo_22lr.getUnlocalizedName()); GameRegistry.registerItem(ammo_22lr_ap, ammo_22lr_ap.getUnlocalizedName()); + GameRegistry.registerItem(ammo_22lr_chlorophyte, ammo_22lr_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae, ammo_50ae.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae_ap, ammo_50ae_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae_du, ammo_50ae_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_50ae_star, ammo_50ae_star.getUnlocalizedName()); + GameRegistry.registerItem(ammo_50ae_chlorophyte, ammo_50ae_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg, ammo_50bmg.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_incendiary, ammo_50bmg_incendiary.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_phosphorus, ammo_50bmg_phosphorus.getUnlocalizedName()); @@ -5288,6 +5316,7 @@ public class ModItems { GameRegistry.registerItem(ammo_50bmg_ap, ammo_50bmg_ap.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_du, ammo_50bmg_du.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_star, ammo_50bmg_star.getUnlocalizedName()); + GameRegistry.registerItem(ammo_50bmg_chlorophyte, ammo_50bmg_chlorophyte.getUnlocalizedName()); GameRegistry.registerItem(ammo_50bmg_sleek, ammo_50bmg_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_fuel, ammo_fuel.getUnlocalizedName()); GameRegistry.registerItem(ammo_fuel_napalm, ammo_fuel_napalm.getUnlocalizedName()); @@ -5303,6 +5332,7 @@ public class ModItems { GameRegistry.registerItem(ammo_rocket_emp, ammo_rocket_emp.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_glare, ammo_rocket_glare.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_toxic, ammo_rocket_toxic.getUnlocalizedName()); + GameRegistry.registerItem(ammo_rocket_canister, ammo_rocket_canister.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_sleek, ammo_rocket_sleek.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_nuclear, ammo_rocket_nuclear.getUnlocalizedName()); GameRegistry.registerItem(ammo_rocket_rpc, ammo_rocket_rpc.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/lib/HbmChestContents.java b/src/main/java/com/hbm/lib/HbmChestContents.java index ad90d8105..cfb7c1d36 100644 --- a/src/main/java/com/hbm/lib/HbmChestContents.java +++ b/src/main/java/com/hbm/lib/HbmChestContents.java @@ -21,13 +21,17 @@ public class HbmChestContents { new WeightedRandomChestContent(ModItems.ingot_steel, 0, 2, 5, 7), new WeightedRandomChestContent(ModItems.ingot_beryllium, 0, 1, 2, 4), new WeightedRandomChestContent(ModItems.ingot_titanium, 0, 1, 1, 3), - new WeightedRandomChestContent(ModItems.circuit_aluminium, 0, 1, 2, 7), new WeightedRandomChestContent(ModItems.circuit_targeting_tier1, 0, 1, 1, 5), new WeightedRandomChestContent(ModItems.gun_revolver, 0, 1, 1, 3), new WeightedRandomChestContent(ModItems.gun_revolver_ammo, 0, 2, 6, 4), new WeightedRandomChestContent(ModItems.gun_kit_1, 0, 1, 3, 4), new WeightedRandomChestContent(ModItems.gun_lever_action, 0, 1, 1, 1), new WeightedRandomChestContent(ModItems.ammo_20gauge, 0, 2, 6, 3), + new WeightedRandomChestContent(ModItems.casing_9, 0, 4, 10, 3), + new WeightedRandomChestContent(ModItems.casing_50, 0, 4, 10, 3), + new WeightedRandomChestContent(ModItems.primer_9, 0, 4, 10, 3), + new WeightedRandomChestContent(ModItems.primer_50, 0, 4, 10, 3), + new WeightedRandomChestContent(ModItems.cordite, 0, 4, 6, 5), new WeightedRandomChestContent(ModItems.battery_generic, 0, 1, 1, 4), new WeightedRandomChestContent(ModItems.battery_advanced, 0, 1, 1, 2), new WeightedRandomChestContent(ModItems.scrap, 0, 1, 3, 10), @@ -48,7 +52,6 @@ public class HbmChestContents { new WeightedRandomChestContent(ModItems.ingot_red_copper, 0, 1, 1, 4), new WeightedRandomChestContent(ModItems.ingot_titanium, 0, 1, 3, 5), new WeightedRandomChestContent(ModItems.wire_red_copper, 0, 2, 3, 7), - new WeightedRandomChestContent(ModItems.circuit_aluminium, 0, 1, 3, 6), new WeightedRandomChestContent(ModItems.circuit_targeting_tier1, 0, 1, 1, 4), new WeightedRandomChestContent(ModItems.circuit_copper, 0, 1, 1, 4), new WeightedRandomChestContent(ModItems.battery_generic, 0, 1, 1, 4), diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 3d20b6881..0a1ff8182 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -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 (3614)"; + public static final String VERSION = "1.0.27 BETA (3626)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index c7b366013..8e0fdea99 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -867,31 +867,39 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_flechette_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_4gauge_flechette, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_balefire, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_4gauge_explosive, 'A', ModItems.egg_balefire_shard }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_kampf, 2), new Object[] { "G", "R", 'G', ModItems.ammo_rocket, 'R', ModItems.ammo_4gauge_explosive }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_canister, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_4gauge_kampf, 'A', ModItems.pellet_canister }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_4gauge_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_4gauge, 'A', ModItems.coin_maskman }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_44_du, 'A', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_44_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_44, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.ingot_semtex }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_5mm_du, 'A', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_5mm_chlorophyte, 4), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_5mm_du, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.ingot_u238 }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_9mm_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_9mm, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_22lr_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_22lr, 'A', ModItems.ingot_dura_steel }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_22lr_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_22lr, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_incendiary, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.powder_fire }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_explosive, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_semtex }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_50bmg_du, 'A', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50bmg_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50bmg, 'A', ModItems.coin_maskman }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50ae, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50ae, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_50ae_du, 'A', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_50ae_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_50ae_du, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_ap, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556, 'A', ModItems.ingot_dura_steel }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_star, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_556_du, 'A', ModItems.ingot_starmetal }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556, 'A', ModItems.pellet_chlorophyte }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556, 'A', ModItems.coin_maskman }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_tracer, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556, 'A', Items.redstone }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_flechette, 4), new Object[] { " B ", "BAB", " B ", 'B', ModItems.ammo_556, 'A', ModItems.pellet_flechette }); @@ -899,7 +907,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_flechette_phosphorus, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556_flechette, 'A', ModItems.ingot_phosphorus }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_flechette_du, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556_flechette, 'A', ModItems.ingot_u238 }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_flechette_sleek, 64), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556_flechette, 'A', ModItems.coin_maskman }); - + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_556_flechette_chlorophyte, 8), new Object[] { "BBB", "BAB", "BBB", 'B', ModItems.ammo_556_flechette, 'A', ModItems.pellet_chlorophyte }); + GameRegistry.addRecipe(new ItemStack(ModItems.folly_bullet, 1), new Object[] { " S ", "STS", "SMS", 'S', ModItems.ingot_starmetal, 'T', ModItems.powder_magic, 'M', ModBlocks.block_meteor }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.folly_bullet_nuclear, 1), new Object[] { " N ", "UTU", "UTU", 'N', ModItems.gun_fatman_ammo, 'U', "ingotIron", 'T', "blockTungsten" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.folly_bullet_du, 1), new Object[] { " U ", "UDU", "UTU", 'U', "blockUranium238", 'D', "blockDesh", 'T', "blockTungsten" })); @@ -917,6 +926,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_shrapnel, 1), new Object[] { "G", "R", 'G', ModItems.pellet_buckshot, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_glare, 1), new Object[] { "GGG", "GRG", "GGG", 'G', Items.redstone, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_toxic, 1), new Object[] { "G", "R", 'G', ModItems.pellet_gas, 'R', ModItems.ammo_rocket }); + GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_canister, 1), new Object[] { "G", "R", 'G', ModItems.pellet_canister, 'R', ModItems.ammo_rocket }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_rocket_nuclear, 1), new Object[] { " P ", "NRN", " P ", 'P', ModItems.nugget_pu239, 'N', "plateDenseLead", 'R', ModItems.ammo_rocket })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_rocket_rpc, 2), new Object[] { "BP ", "CBH", " DR", 'B', ModItems.blades_steel, 'P', "plateSteel", 'C', ModItems.canister_fuel, 'H', ModItems.hull_small_steel, 'D', ModItems.piston_selenium, 'R', ModItems.ammo_rocket })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_rocket_rpc, 2), new Object[] { "BP ", "CBH", " DR", 'B', ModItems.blades_steel, 'P', "plateSteel", 'C', ModItems.canister_petroil, 'H', ModItems.hull_small_steel, 'D', ModItems.piston_selenium, 'R', ModItems.ammo_rocket })); diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 48af95950..4bff8d574 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -54,7 +54,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; -import net.minecraft.world.World; import net.minecraftforge.client.event.MouseEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; @@ -301,6 +300,24 @@ public class ModEventHandlerClient { @SubscribeEvent public void onRenderWorldLastEvent(RenderWorldLastEvent event) { + /* + * what a fucking moron can't even say sorry to some internet retard and has to resort to spending + * hours with modeling a fucking orbital module so he can attach a message to it which is rendered + * in the world at an unreachable space as if anyone's going to read that + * + * the 1.12 port def doesn't need any of this, no idea what to do now that i have the oribtal module <=== correction: the floaty orbital module is kinda fun to have, the attached message is obsolete though + * modeled and textured or with render-in-world technology. i'm 90% sure it was a huge waste of time + * (as is almost everything i do, why have nice things when you can mope and dick around ad infinitum) + * but at least i can p r e t e n d that i was productive in the last couple of days. cyclotron + * overhaul? new turrets? the new silo hatch i promised? nah, i gotta waste time like the retard + * that i am. thinking about it, leaving this note here will make me look like an even bigger + * dumbass, but at this point, why care? + * + * and the retard that i am, i realized 5 hours in that i forgot to add the small cupola window to the + * orbital module, and adding that would mean i'd have to expand the texture and in term redo the UV, + * but who has time for that considering this model is basically useless anyway? + */ + GL11.glPushMatrix(); EntityPlayer player = Minecraft.getMinecraft().thePlayer; @@ -319,16 +336,56 @@ public class ModEventHandlerClient { if(vec.lengthVector() < dist) { GL11.glTranslated(vec.xCoord, vec.yCoord, vec.zCoord); + + GL11.glPushMatrix(); + + RenderHelper.enableStandardItemLighting(); GL11.glRotated(80, 0, 0, 1); GL11.glRotated(30, 0, 1, 0); + double sine = Math.sin(System.currentTimeMillis() * 0.0005) * 5; + double sin3 = Math.sin(System.currentTimeMillis() * 0.0005 + Math.PI * 0.5) * 5; + GL11.glRotated(sine, 0, 0, 1); + GL11.glRotated(sin3, 1, 0, 0); + GL11.glTranslated(0, -3, 0); - - RenderHelper.enableStandardItemLighting(); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 6500F, 30F); SoyuzPronter.prontCapsule(); + + GL11.glRotated(System.currentTimeMillis() * 0.025 % 360, 0, -1, 0); + + String msg = "nosta pls am sorry the server is going to hell"; + + GL11.glTranslated(0, 3.75, 0); + GL11.glRotated(180, 1, 0, 0); + + float rot = 0F; + + //looks dumb but we'll use this technology for the cyclotron + for(char c : msg.toCharArray()) { + + GL11.glPushMatrix(); + + GL11.glRotatef(rot, 0, 1, 0); + + rot -= Minecraft.getMinecraft().fontRenderer.getCharWidth(c); + + GL11.glTranslated(2, 0, 0); + + GL11.glRotatef(-90, 0, 1, 0); + + float scale = 0.03F; + GL11.glScalef(scale, scale, scale); + GL11.glDisable(GL11.GL_CULL_FACE); + Minecraft.getMinecraft().fontRenderer.drawString(String.valueOf(c), 0, 0, 0xff00ff); + GL11.glEnable(GL11.GL_CULL_FACE); + GL11.glPopMatrix(); + } + RenderHelper.disableStandardItemLighting(); + + GL11.glPopMatrix(); } GL11.glPopMatrix();