Skip to content

Commit

Permalink
added adamantium, moved around a couple other materials
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Feb 6, 2025
1 parent 194681b commit befab2b
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 27 deletions.
21 changes: 21 additions & 0 deletions common/src/main/java/org/gtreimagined/gt5r/data/Elements.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package org.gtreimagined.gt5r.data;

import muramasa.antimatter.material.Element;

public class Elements {
public static Element Ma = Element.Ma;
public static Element Nt = Element.Nt;
//bullshit elements from stargate
public static Element Nq = Element.Naq;
public static Element Ke = Element.Ke;

/*public static Element Ma = new Element(0, 0, 100, 1,1,"magic", "Ma",-1,null,null, null, false);
public static Element Nt = new Element(0, 100000, 0, 1,1,"neutronium", "Nt",-1,null,null, null, false);
//bullshit elements from stargate
public static Element Nq = new Element(174, 352, 0, 1, 1, "naquadah", "Nq", -1, null, null, null, false);
public static Element Ke = new Element(126, 192, 0, 1, 1, "trinium", "Ke", -1, null, null, null, false);*/
public static Element Ad = new Element(222, 580, 0, 1, 1, "adamantium", "Ad", -1, null, null, null, false);

public static Element Nq522 = new Element(174, 348, 0, 1, 1, "naquadria", "Nq522", -1, null, null, null, true);
public static Element Nq528 = new Element(174, 354, 0, 1, 1, "enriched_naquadah", "Nq528", -1, null, null, null, true);
}
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public Texture[] getTextures() {
public static final BlockColoredWall NETHERITE_WALL = new BlockColoredWall(GT5RRef.ID, AntimatterMaterials.Netherite);
public static final BlockColoredWall TUNGSTENSTEEL_WALL = new BlockColoredWall(GT5RRef.ID, Materials.TungstenSteel);
public static final BlockColoredWall TUNGSTEN_WALL = new BlockColoredWall(GT5RRef.ID, Materials.Tungsten);
public static final BlockColoredWall ADAMANTIUM_WALL = new BlockColoredWall(GT5RRef.ID, Materials.Adamantium);
public static final BlockCasing LONG_DIST_ITEM_PIPE = new BlockCasing(GT5RRef.ID, "long_distance_item_pipe");
public static final BlockCasing LONG_DIST_FLUID_PIPE = new BlockCasing(GT5RRef.ID, "long_distance_fluid_pipe");
public static final BlockCasing LONG_DIST_WIRE_EV = new BlockCasing(GT5RRef.ID, "long_distance_wire_ev", Block.Properties.of(Material.WOOL).strength(1.0f, 10.0f).sound(SoundType.WOOL));
Expand Down Expand Up @@ -287,6 +288,7 @@ public Texture[] getTextures() {
public static final FluidPipe<?> FLUID_PIPE_RUBBER = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.Rubber, 350, true).caps(1).pressures(getPressures(300)));
public static final FluidPipe<?> FLUID_PIPE_PLASTIC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.Plastic, 370, true).caps(1).pressures(getPressures(300)));
public static final FluidPipe<?> FLUID_PIPE_PVC = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.PolyvinylChloride, 333, true).caps(1).pressures(getPressures(450)));
public static final FluidPipe<?> FLUID_PIPE_ADAMANTIUM = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Adamantium, 6531, true).acidProof(true).pressures(getPressures(30000)));
public static final FluidPipe<?> FLUID_PIPE_HP = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.HighPressure, 3422, true).sizes(PipeSize.SMALL, PipeSize.NORMAL, PipeSize.LARGE).caps(1).pressures(10000));
public static final FluidPipe<?> FLUID_PIPE_PLASMA = AntimatterAPI.register(FluidPipe.class, new FluidPipe<>(GT5RRef.ID, Materials.PlasmaContainment, 100000, true).sizes(PipeSize.NORMAL).caps(1).pressures(100000));
public static final ItemPipe<?> ITEM_PIPE_BRASS = AntimatterAPI.register(ItemPipe.class, new ItemPipe<>(GT5RRef.ID, Materials.Brass).stepsize(32768).caps(0, 0, 0, 1, 2, 4));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public class GT5RMachines {
public static DrumMachine NETHERRITE_DRUM = GTCoreBlocks.createDrum(AntimatterMaterials.Netherite, 128000).acidProof();
public static DrumMachine TUNGSTENSTEEL_DRUM = GTCoreBlocks.createDrum(Materials.TungstenSteel, 256000);
public static DrumMachine TUNGSTEN_DRUM = GTCoreBlocks.createDrum(Materials.Tungsten, 256000);
public static DrumMachine ADAMANTIUM = GTCoreBlocks.createDrum(Materials.Adamantium, 4096000).acidProof();

public static MultiblockTankMachine WOOD_TANK;
public static MultiblockTankMachine[] STEEL_TANKS;
Expand All @@ -231,6 +232,7 @@ public class GT5RMachines {
public static MultiblockTankMachine[] NETHERITE_TANKS;
public static MultiblockTankMachine[] TUNGSTENSTEEL_TANKS;
public static MultiblockTankMachine[] TUNGSTEN_TANKS;
public static MultiblockTankMachine[] ADAMANTIUM_TANKS;

public static void initTanks() {
WOOD_TANK = new MultiblockTankMachine(GT5RRef.ID, Wood, true, 432000, () -> GT5RBlocks.WOOD_WALL).maxHeat(350);
Expand All @@ -241,6 +243,7 @@ public static void initTanks() {
NETHERITE_TANKS = createTankMachine(Netherite, 8);
TUNGSTENSTEEL_TANKS = createTankMachine(Materials.TungstenSteel, 16);
TUNGSTEN_TANKS = createTankMachine(Materials.Tungsten, 16);
ADAMANTIUM_TANKS = createTankMachine(Materials.Adamantium, 256);
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ private static void defaultMaterialFlags(GregTechMaterialEvent event){
event.setMaterial(Materials.Plutonium).asMetal(912);
event.setMaterial(Materials.Americium).asMetal(1149, ROD_LONG);
//Elements 96 - 118 not added

event.setMaterial(Materials.Neutronium).asMetal(10000, SCREW, BOLT, RING, FRAME);
event.setMaterial(Materials.Naquadah).asOre().asMetal(5400);
event.setMaterial(Materials.EnrichedNaquadah).asMetal(4500, POSITIVE_CHANGING_RGB);
event.setMaterial(Materials.Naquadria).asMetal(9000, POSITIVE_CHANGING_RGB);
event.setMaterial(Adamantium).asMetal(5225);
/**
*** Solids
**/
Expand All @@ -140,8 +146,8 @@ private static void defaultMaterialFlags(GregTechMaterialEvent event){
event.setMaterial(Materials.BatteryAlloy).asMetal(295, PLATE, ALLOY);
event.setMaterial(Materials.BismuthBronze).asMetal(1100, PLATE, ALLOY);
event.setMaterial(Materials.BlackBronze).asMetal(2000, FRAME, ALLOY);
event.setMaterial(Materials.BlackSteel).asMetal(1200, 1200, FRAME, PLATE).forceBF(false);
event.setMaterial(Materials.BlueSteel).asMetal(1400, 1400, FRAME).forceBF(false);
event.setMaterial(Materials.BlackSteel).asMetal(1200, FRAME, PLATE).forceBF(false);
event.setMaterial(Materials.BlueSteel).asMetal(1400, FRAME).forceBF(false);
event.setMaterial(Materials.Brass).asMetal(1170, FRAME, ROD_LONG, PLATE, GEAR_SMALL, ALLOY);
event.setMaterial(Materials.Bronze).asMetal(1125, GEAR, FRAME, ROTOR, ALLOY);
event.setMaterial(Materials.CdInAGAlloy).asMetal(752, ROD, ALLOY);
Expand All @@ -150,40 +156,36 @@ private static void defaultMaterialFlags(GregTechMaterialEvent event){
event.setMaterial(DamascusSteel).asMetal(2000, 1500, PLATE).forceBF(false);
event.setMaterial(Materials.Duranium).asMetal(295, MOLTEN);
event.setMaterial(Materials.Electrum).asMetal(1330, PLATE, FOIL, ROD_LONG, WIRE_FINE, ALLOY);
event.setMaterial(Materials.EnrichedNaquadah).asMetal(4500, 4500, POSITIVE_CHANGING_RGB);
event.setMaterial(Materials.GalliumArsenide).asMetal(295, 1200, PLATE, ALLOY);
event.setMaterial(Materials.HSSE).asMetal(5400, 5400, FRAME);
event.setMaterial(Materials.HSSG).asMetal(4500, 4500, FRAME);
event.setMaterial(Materials.HSSS).asMetal(5400, 5400);
event.setMaterial(Materials.HSSE).asMetal(5400, FRAME);
event.setMaterial(Materials.HSSG).asMetal(4500, FRAME);
event.setMaterial(Materials.HSSS).asMetal(5400);
event.setMaterial(Materials.Invar).asMetal(1700, FRAME, RING, ALLOY);
event.setMaterial(Materials.IronMagnetic).asMetal(1811, ROD_LONG);
event.setMaterial(Materials.Kanthal).asMetal(1800).forceBF(true);
event.setMaterial(GTCoreMaterials.LeadedRedstone).asMetal(600, ALLOY);
event.setMaterial(Materials.Magnalium).asMetal(870, PLATE, ROD_LONG, ALLOY);
event.setMaterial(Materials.NeodymiumMagnetic).asMetal(1297, ROD_LONG);
event.setMaterial(Materials.Neutronium).asMetal(10000, 10000, SCREW, BOLT, RING, FRAME);
event.setMaterial(Materials.Naquadah).asOre().asMetal(5400, 5400);
event.setMaterial(Materials.NaquadahAlloy).asMetal(7200, 7200);
event.setMaterial(Materials.Naquadria).asMetal(9000, 9000, POSITIVE_CHANGING_RGB);
event.setMaterial(Materials.Nichrome).asMetal(2700, 2700);
event.setMaterial(Materials.NaquadahAlloy).asMetal(7200);
event.setMaterial(Materials.Nichrome).asMetal(2700);
event.setMaterial(Materials.NickelZincFerrite).asMetal(1500);
event.setMaterial(Materials.NiobiumTitanium).asMetal(4500, 4500, PLATE, FOIL, ROD_LONG, WIRE_FINE);
event.setMaterial(Materials.NiobiumTitanium).asMetal(4500, PLATE, FOIL, ROD_LONG, WIRE_FINE);
event.setMaterial(Materials.Osmiridium).asMetal(3333, 2500, FRAME);
event.setMaterial(Materials.RedAlloy).asMetal(295, PLATE, FOIL, ROD_LONG, WIRE_FINE, ALLOY);
event.setMaterial(Materials.RedSteel).asMetal(1300, 1300).forceBF(false);
event.setMaterial(Materials.RoseGold).asMetal(1600, WIRE_FINE, ALLOY);
event.setMaterial(Materials.SolderingAlloy).asMetal(400, PLATE, ROD_LONG, ALLOY);
event.setMaterial(Materials.Steel).asMetal(1811, 1000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING, WIRE_FINE).forceBF(false);
event.setMaterial(Materials.SteelMagnetic).asMetal(1000, 1000, ROD_LONG).forceBF(false);
event.setMaterial(Materials.SteelMagnetic).asMetal(1000, ROD_LONG).forceBF(false);
event.setMaterial(Materials.SterlingSilver).asMetal(1700, ALLOY);
event.setMaterial(Materials.StainlessSteel).asMetal(1700, 1700, PLATE, PLATE_DENSE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING).forceBF(false);
event.setMaterial(Materials.StainlessSteel).asMetal(1700, PLATE, PLATE_DENSE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL, ITEM_CASING).forceBF(false);
event.setMaterial(Materials.TinAlloy).asMetal(1158, ALLOY, PLATE);
event.setMaterial(Materials.Tritanium).asMetal(295, FRAME, MOLTEN);
event.setMaterial(Materials.TungstenCarbide).asMetal(2460, 2460);
event.setMaterial(Materials.TungstenSteel).asMetal(3000, 3000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL);
event.setMaterial(Materials.Ultimet).asMetal(2700, 2700, PLATE);
event.setMaterial(Materials.VanadiumGallium).asMetal(4500, 4500, ROD_LONG, PLATE);
event.setMaterial(Materials.VanadiumSteel).asMetal(1453, 1453).forceBF(false);
event.setMaterial(Materials.TungstenCarbide).asMetal(2460);
event.setMaterial(Materials.TungstenSteel).asMetal(3000, PLATE, ROD_LONG, SCREW, BOLT, RING, GEAR, FRAME, ROTOR, GEAR_SMALL);
event.setMaterial(Materials.Ultimet).asMetal(2700, PLATE);
event.setMaterial(Materials.VanadiumGallium).asMetal(4500, ROD_LONG, PLATE);
event.setMaterial(Materials.VanadiumSteel).asMetal(1453).forceBF(false);
event.setMaterial(Materials.Vibranium).asMetal(295, FRAME);
event.setMaterial(Materials.WroughtIron).asMetal(1811, PLATE, ROD_LONG, SCREW, BOLT, RING, FRAME).remove(DUST, DUST_SMALL, DUST_TINY);
event.setMaterial(Materials.YttriumBariumCuprate).asMetal(4500, PLATE, FOIL, ROD_LONG, WIRE_FINE, ALLOY);
Expand Down Expand Up @@ -1017,6 +1019,10 @@ private static void toolsAndArmor(GregTechMaterialEvent event){
event.setMaterial(Materials.Uranium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build();
event.setMaterial(Materials.Plutonium).tool().toolDamage(3).toolSpeed(6).toolDurability(512).toolQuality(3).build(); // TODO: Enchantment: Radioactivity;

event.setMaterial(Materials.Neutronium).tool().toolDamage(9).toolSpeed(24).toolDurability(655360).toolQuality(6).build();
event.setMaterial(Materials.Naquadah).tool().toolDamage(4).toolSpeed(6).toolDurability(1280).toolQuality(4).build();
event.setMaterial(Adamantium).tool().toolDamage(5).toolSpeed(10).toolDurability(5120).toolQuality(5).toolEnchantments(of(Enchantments.SILK_TOUCH, 1, Enchantments.SHARPNESS, 7, Enchantments.POWER_ARROWS, 7)).build();

/**
** Metals
**/
Expand All @@ -1031,7 +1037,7 @@ private static void toolsAndArmor(GregTechMaterialEvent event){
event.setMaterial(Materials.Bronze).tool().toolDamage(2).toolSpeed(6).toolDurability(448).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 1)).build()
.addArmor(new int[]{2, 6, 5, 2}, 0.0F, 0.0F, 12);
event.setMaterial(Materials.CobaltBrass).tool().toolDamage(2).toolSpeed(8).toolDurability(256).toolQuality(2).toolEnchantments(of(Enchantments.SHARPNESS, 2)).build();
event.setMaterial(DamascusSteel).tool().toolDamage(6).toolDurability(1280).toolSpeed(8).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 5)).build();
event.setMaterial(DamascusSteel).tool().toolDamage(2).toolDurability(1280).toolSpeed(8).toolQuality(3).toolEnchantments(of(Enchantments.SHARPNESS, 5)).build();
//event.setMaterial(Duranium).addHandleStat(620, -1.0F, of(Enchantments.SILK_TOUCH, 1))
//.addTools(6.5F, 16.0F, 5120, 5);
event.setMaterial(Materials.Electrum).tool().toolDamage(2).toolSpeed(12).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.SMITE, 3)).build();
Expand All @@ -1043,8 +1049,6 @@ private static void toolsAndArmor(GregTechMaterialEvent event){
.addArmor(new int[]{2, 6, 5, 2}, 0.0F, 0.0F, 15, of(Enchantments.FIRE_PROTECTION, 1));
event.setMaterial(Materials.IronMagnetic).tool(Iron).toolEnchantments(of(Enchantments.SHARPNESS, 1)).build();
event.setMaterial(Materials.Kanthal).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).build();
event.setMaterial(Materials.Neutronium).tool().toolDamage(9).toolSpeed(24).toolDurability(655360).toolQuality(6).build();
event.setMaterial(Materials.Naquadah).tool().toolDamage(4).toolSpeed(6).toolDurability(1280).toolQuality(4).build();
event.setMaterial(Materials.NaquadahAlloy).tool().toolDamage(4.5f).toolSpeed(8).toolDurability(5120).toolQuality(4).build();
event.setMaterial(Materials.Nichrome).tool().toolDamage(2).toolSpeed(6).toolDurability(64).toolQuality(2).toolEnchantments(of(Enchantments.BANE_OF_ARTHROPODS, 2)).build();
event.setMaterial(Materials.NickelZincFerrite).tool().toolDamage(0).toolSpeed(3).toolDurability(32).toolQuality(1).build();
Expand Down Expand Up @@ -1197,7 +1201,7 @@ private static void workbenches(GregTechMaterialEvent event){
GTCoreBlocks.createHopper(Iridium, 36);
GTCoreBlocks.createHopper(Osmium, 36);
//GTCoreBlocks.createHopper(TritaniumAlloy, 36);
//GTCoreBlocks.createHopper(Adamantium, 36);
GTCoreBlocks.createHopper(Adamantium, 36);
}

public static void byproducts(GregTechMaterialEvent event){
Expand Down
14 changes: 10 additions & 4 deletions common/src/main/java/org/gtreimagined/gt5r/data/Materials.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import muramasa.antimatter.AntimatterAPI;
import muramasa.antimatter.Ref;
import muramasa.antimatter.material.Element;
import muramasa.antimatter.material.Material;
import net.minecraft.world.item.DyeColor;
import org.gtreimagined.gt5r.GT5RRef;
Expand Down Expand Up @@ -117,6 +118,15 @@ public class Materials {
public static Material Fermium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "fermium", 0x7b3cab, RAD, Fm));
public static Material Mendelevium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "mendelevium", 0x183dab, RAD, Md));

/**
* Fantasy/SciFi elements
*/

public static Material Naquadah = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "naquadah", 0x323232, METALLIC, Elements.Nq));
public static Material EnrichedNaquadah = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "enriched_naquadah", 0x323232, SHINY, Elements.Nq528));
public static Material Naquadria = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "naquadria", 0x1e1e1e, SHINY, Elements.Nq522));
public static Material Neutronium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "neutronium", 0xfafafa, DULL, Elements.Nt));
public static Material Adamantium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "adamantium", 0xffffff, SHINY, Elements.Ad));
/**
*** Isotopes
**/
Expand Down Expand Up @@ -157,19 +167,15 @@ public class Materials {
public static Material DamascusSteel = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "damascus_steel", 0x6e6e6e, METALLIC));
public static Material Duranium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "duranium", 0xffffff, METALLIC));
public static Material Electrum = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "electrum", 0xffff64, SHINY));
public static Material EnrichedNaquadah = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "enriched_naquadah", 0x323232, SHINY));
public static Material HSSE = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "hsse", 0x336600, METALLIC)).setDisplayNameString("HSS-E");
public static Material HSSG = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "hssg", 0x999900, METALLIC)).setDisplayNameString("HSS-G");
public static Material HSSS = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "hsss", 0x660033, METALLIC)).setDisplayNameString("HSS-S");
public static Material Invar = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "invar", 0xb4b478, METALLIC));
public static Material IronMagnetic = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "magnetic_iron", 0xc8c8c8, MAGNETIC)).setMassMultiplierAndDivider(51, 50);
public static Material Kanthal = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "kanthal", 0xc2d2df, METALLIC));
public static Material Magnalium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "magnalium", 0xc8beff, DULL));
public static Material Naquadah = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "naquadah", 0x323232, METALLIC, Naq));
public static Material NaquadahAlloy = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "naquadah_alloy", 0x282828, METALLIC));
public static Material Naquadria = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "naquadria", 0x1e1e1e, SHINY));
public static Material NeodymiumMagnetic = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "magnetic_neodymium", 0x646464, MAGNETIC)).setMassMultiplierAndDivider(51, 50);
public static Material Neutronium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "neutronium", 0xfafafa, DULL, Nt));
public static Material Nichrome = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "nichrome", 0xcdcef6, METALLIC));
public static Material NickelZincFerrite = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "nickel_zinc_ferrite", 0x3c3c3c, ROUGH));
public static Material NiobiumTitanium = AntimatterAPI.register(Material.class, new Material(GT5RRef.ID, "niobium_titanium", 0x1d1d29, DULL));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ private static void casings() {
addWall(Titanium, GT5RBlocks.TITANIUM_WALL);
addWall(TungstenSteel, GT5RBlocks.TUNGSTENSTEEL_WALL);
addWall(Netherite, GT5RBlocks.NETHERITE_WALL);
addWall(Adamantium, GT5RBlocks.ADAMANTIUM_WALL);

addCasing(Bronze, GT5RBlocks.CASING_BRONZE);
addCasing(Steel, GT5RBlocks.CASING_SOLID_STEEL);
Expand Down

0 comments on commit befab2b

Please sign in to comment.