From 329846f0949fb363f39415c864f6a9c8b6161ad7 Mon Sep 17 00:00:00 2001 From: Gregorius Techneticies Date: Thu, 21 Sep 2023 22:54:31 +0200 Subject: [PATCH] moved the autocollecting stat to its own value so taht its no longer bound to magnetism --- src/main/java/gregapi/GT_API_Post.java | 2 +- src/main/java/gregapi/data/MT.java | 42 +++++++++---------- src/main/java/gregapi/data/TD.java | 6 ++- .../gregapi/item/multiitem/MultiItemTool.java | 4 +- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/java/gregapi/GT_API_Post.java b/src/main/java/gregapi/GT_API_Post.java index d1ddfbb51..99eae0da1 100644 --- a/src/main/java/gregapi/GT_API_Post.java +++ b/src/main/java/gregapi/GT_API_Post.java @@ -608,7 +608,7 @@ public void onModPostInit2(FMLPostInitializationEvent aEvent) { tMaterial.addEnchantmentForTools(tEnchant, 3).addEnchantmentForWeapons(tEnchant, 3).addEnchantmentForArmors(tEnchant, 3); } else if (tMaterial == MT.SteelMagnetic || tMaterial == MT.MeteoricSteel || tMaterial == MT.MeteoricBlackSteel || tMaterial == MT.MeteoricBlueSteel || tMaterial == MT.MeteoricRedSteel || tMaterial == MT.MeteoflameSteel || tMaterial == MT.MeteoflameBlackSteel || tMaterial == MT.MeteoflameBlueSteel || tMaterial == MT.MeteoflameRedSteel || tMaterial == MT.Meteorite) { tMaterial.addEnchantmentForTools(tEnchant, 2).addEnchantmentForWeapons(tEnchant, 2).addEnchantmentForArmors(tEnchant, 2); - } else if (tMaterial.contains(TD.Properties.MAGNETIC_ACTIVE)) { + } else if (tMaterial.containsAny(TD.Properties.MAGNETIC_ACTIVE, TD.Properties.AUTO_COLLECTING)) { tMaterial.addEnchantmentForTools(tEnchant, 1).addEnchantmentForWeapons(tEnchant, 1).addEnchantmentForArmors(tEnchant, 1); } } diff --git a/src/main/java/gregapi/data/MT.java b/src/main/java/gregapi/data/MT.java index 2fb6cb5eb..93faab727 100644 --- a/src/main/java/gregapi/data/MT.java +++ b/src/main/java/gregapi/data/MT.java @@ -1269,7 +1269,7 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { WaxSoulful = wax ( 8281, "WaxSoulful" , 90, 40, 10, 255, MAGICAL) .aspects(TC.SPIRITUS , 1).heat( 350).setLocal("Soulful Wax"), - Basalz = blaze ( 8247, "Basalz" , 100, 81, 81 , MAGNETIC_ACTIVE) .aspects(TC.TERRA, 4), + Basalz = blaze ( 8247, "Basalz" , 100, 81, 81 , MAGNETIC_ACTIVE, AUTO_COLLECTING) .aspects(TC.TERRA, 4), Blitz = blaze ( 8248, "Blitz" , 250, 219, 0 ) .aspects(TC.AER , 4), Blizz = blaze ( 8210, "Blizz" , 33, 200, 234 ) .aspects(TC.GELUM, 4), Blaze = blaze ( 8211, "Blaze" , 255, 200, 0 , UNBURNABLE, BURNING, MELTING, TICKS_PER_SMELT*24) .aspects(TC.IGNIS, 4).heat(4000), @@ -1728,9 +1728,9 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { PigIron = metalmachore ( 8642, "Pig Iron" , 200, 180, 180 , MOLTEN, MORTAR, MAGNETIC_PASSIVE) .uumMcfg( 0, WroughtIron , 1*U) .aspects(TC.METALLUM, 2, TC.INSTRUMENTUM, 1 ).setPulver(Fe , U).setSmelting(WroughtIron, U) .steal(WroughtIron).qual(3, 6.0, 384, 2), IronCompressed = alloymachnd ( 8644, "IronCompressed" , SET_METALLIC , 128, 128, 128 , CENTRIFUGE, MORTAR, MAGNETIC_PASSIVE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.TERRA, 1 ).setPulver(Fe , U).setSmelting(Fe , U) .steal(Fe ).setLocal("Compressed Iron"), IronCast = alloymachnd ( 8803, "Cast Iron" , SET_METALLIC , 64, 64, 64 , CENTRIFUGE, MORTAR, MAGNETIC_PASSIVE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.TERRA, 1 ).setPulver(Fe , U) .steal(Fe ), - IronMagnetic = metalmachnd ( 8645, "IronMagnetic" , SET_MAGNETIC , 200, 200, 200 , LAYERED, MORTAR, MAGNETIC_ACTIVE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1 ).setBending(Fe , U).setCompressing(Fe , U).setPulver(Fe , U).setSmashing(Fe , U).setSmelting(Fe , U).setWorking(Fe , U).setForging(Fe , U).steal(Fe ).setLocal("Magnetic Iron"), - SteelMagnetic = metalmachnd ( 8646, "SteelMagnetic" , SET_MAGNETIC , 128, 128, 128 , LAYERED, MORTAR, MAGNETIC_ACTIVE) .uumMcfg( 0, Steel , 1*U) .aspects(TC.METALLUM, 1, TC.ORDO, 1, TC.MAGNETO, 1).setBending(Steel, U).setCompressing(Steel , U).setPulver(Steel, U).setSmashing(Steel, U).setSmelting(Steel, U).setWorking(Steel, U).setForging(Steel, U).steal(Steel ).setLocal("Magnetic Steel"), - NeodymiumMagnetic = metalmachnd ( 8647, "NeodymiumMagnetic" , SET_MAGNETIC , 100, 100, 100 , LAYERED, MORTAR, MAGNETIC_ACTIVE) .uumMcfg( 0, Nd , 1*U) .aspects(TC.METALLUM, 1, TC.MAGNETO, 3 ).setBending(Fe , U).setCompressing(Nd , U).setPulver(Nd , U).setSmashing(Nd , U).setSmelting(Nd , U).setWorking(Nd , U).setForging(Nd , U).steal(Nd ).setLocal("Magnetic Neodymium"), + IronMagnetic = metalmachnd ( 8645, "IronMagnetic" , SET_MAGNETIC , 200, 200, 200 , LAYERED, MORTAR, MAGNETIC_ACTIVE, AUTO_COLLECTING) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1 ).setBending(Fe , U).setCompressing(Fe , U).setPulver(Fe , U).setSmashing(Fe , U).setSmelting(Fe , U).setWorking(Fe , U).setForging(Fe , U).steal(Fe ).setLocal("Magnetic Iron"), + SteelMagnetic = metalmachnd ( 8646, "SteelMagnetic" , SET_MAGNETIC , 128, 128, 128 , LAYERED, MORTAR, MAGNETIC_ACTIVE, AUTO_COLLECTING) .uumMcfg( 0, Steel , 1*U) .aspects(TC.METALLUM, 1, TC.ORDO, 1, TC.MAGNETO, 1).setBending(Steel, U).setCompressing(Steel , U).setPulver(Steel, U).setSmashing(Steel, U).setSmelting(Steel, U).setWorking(Steel, U).setForging(Steel, U).steal(Steel ).setLocal("Magnetic Steel"), + NeodymiumMagnetic = metalmachnd ( 8647, "NeodymiumMagnetic" , SET_MAGNETIC , 100, 100, 100 , LAYERED, MORTAR, MAGNETIC_ACTIVE, AUTO_COLLECTING) .uumMcfg( 0, Nd , 1*U) .aspects(TC.METALLUM, 1, TC.MAGNETO, 3 ).setBending(Fe , U).setCompressing(Nd , U).setPulver(Nd , U).setSmashing(Nd , U).setSmelting(Nd , U).setWorking(Nd , U).setForging(Nd , U).steal(Nd ).setLocal("Magnetic Neodymium"), DarkIron = metalmachore ( 8648, "Dark Iron" , SET_DULL , 55, 40, 60 , MAGNETIC_PASSIVE, "FzDarkIron", "FZDarkIron") .setMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 1).steal(Fe).qual(3, 7.0, 384, 3).heat(Steel.mMeltingPoint + 200, Fe.mBoilingPoint), SteelGalvanized = clloymachine ( 8651, "SteelGalvanized" , 250, 240, 240 , COATED, CENTRIFUGE).qual(3, 7.0, 768, 2) .setMcfg( 9, Steel , 9*U, Zn , 1*U) .aspects(TC.METALLUM, 3, TC.SANO, 1).setSmelting(Steel, U).setForging(Steel, U).setLocal("Galvanized Steel"), TungstenSintered = alloymachnd ( 8652, "TungstenSintered" , SET_METALLIC , 70, 70, 70 , RAILS, UNBURNABLE).qual(3, 8.0, 5120, 3) .uumMcfg( 0, W , 1*U) .aspects(TC.METALLUM, 3, TC.TUTAMEN, 1).steal(W).setAllToTheOutputOf(W).setForging(null, U).setCutting(null, U).setWorking(null, U).setSmashing(null, U).setLocal("Sintered Tungsten"), @@ -1738,11 +1738,11 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { Ta4HfC5 = alloymachine ( 8802, "Tantalum Hafnium Carbide" , 32, 128, 32 , UNBURNABLE) .uumAloy( 0, Ta , 4*U, Hf , 1*U, C , 5*U) .aspects(TC.METALLUM, 2, TC.GELUM, 2).qual(2).heat(4263), - MeteoricIron = metalmachore ( 8649, "Meteoric Iron" , SET_SPACE , 150, 140, 120 , MOLTEN, MAGNETIC_ACTIVE, RAILS, DECOMPOSABLE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1).steal(WroughtIron).qual(3, 7.0, 896, 2).heat(Fe.mMeltingPoint + 200, Fe.mBoilingPoint + 200), - MeteoricSteel = alloymachine ( 8650, "Meteoric Steel" , SET_SPACE , 130, 120, 100 , MOLTEN, MAGNETIC_ACTIVE, RAILS) .uumMcfg( 0, MeteoricIron , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1).steal(Steel).qual(3, 8.0, 1280, 2).heat(Steel.mMeltingPoint + 200, Steel.mBoilingPoint + 200), - MeteoricBlackSteel = alloymachine ( 8690, "Meteoric Black Steel" , 85, 85, 85 , MOLTEN, MAGNETIC_ACTIVE).qual(3, 8.0, 1280, 2) .uumAloy( 0, Ni , 1*U, BlackBronze , 1*U, MeteoricSteel , 3*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1), - MeteoricBlueSteel = alloymachine ( 8691, "Meteoric Blue Steel" , 95, 95, 135 , MOLTEN, MAGNETIC_ACTIVE).qual(3, 8.5, 1408, 2) .setAloy( 0, SterlingSilver , 1*U, BismuthBronze , 1*U, MeteoricSteel , 2*U, MeteoricBlackSteel,4*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1), - MeteoricRedSteel = alloymachine ( 8692, "Meteoric Red Steel" , 135, 95, 95 , MOLTEN, MAGNETIC_ACTIVE).qual(3, 9.0, 1536, 2) .uumAloy( 0, RoseGold , 1*U, Brass , 1*U, MeteoricSteel , 2*U, MeteoricBlackSteel,4*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1), + MeteoricIron = metalmachore ( 8649, "Meteoric Iron" , SET_SPACE , 150, 140, 120 , MOLTEN, MAGNETIC_ACTIVE, AUTO_COLLECTING, RAILS, DECOMPOSABLE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1).steal(WroughtIron).qual(3, 7.0, 896, 2).heat(Fe.mMeltingPoint + 200, Fe.mBoilingPoint + 200), + MeteoricSteel = alloymachine ( 8650, "Meteoric Steel" , SET_SPACE , 130, 120, 100 , MOLTEN, MAGNETIC_ACTIVE, AUTO_COLLECTING, RAILS) .uumMcfg( 0, MeteoricIron , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1).steal(Steel).qual(3, 8.0, 1280, 2).heat(Steel.mMeltingPoint + 200, Steel.mBoilingPoint + 200), + MeteoricBlackSteel = alloymachine ( 8690, "Meteoric Black Steel" , 85, 85, 85 , MOLTEN, MAGNETIC_ACTIVE, AUTO_COLLECTING).qual(3, 8.0, 1280, 2) .uumAloy( 0, Ni , 1*U, BlackBronze , 1*U, MeteoricSteel , 3*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1), + MeteoricBlueSteel = alloymachine ( 8691, "Meteoric Blue Steel" , 95, 95, 135 , MOLTEN, MAGNETIC_ACTIVE, AUTO_COLLECTING).qual(3, 8.5, 1408, 2) .setAloy( 0, SterlingSilver , 1*U, BismuthBronze , 1*U, MeteoricSteel , 2*U, MeteoricBlackSteel,4*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1), + MeteoricRedSteel = alloymachine ( 8692, "Meteoric Red Steel" , 135, 95, 95 , MOLTEN, MAGNETIC_ACTIVE, AUTO_COLLECTING).qual(3, 9.0, 1536, 2) .uumAloy( 0, RoseGold , 1*U, Brass , 1*U, MeteoricSteel , 2*U, MeteoricBlackSteel,4*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1), RedAlloy = clloy ( 8660, "Red Alloy" , 200, 0, 0 , MORTAR, WIRES, FURNACE, EXTRUDER_SIMPLE, MOLTEN) .uumAloy( 1, Cu , 1*U, Redstone , 4*U) .aspects(TC.MACHINA, 3).heat(1400, Cu.mBoilingPoint), @@ -1763,14 +1763,14 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { BatteryAlloy = alloy ( 8668, "Battery Alloy" , SET_DULL , 156, 124, 160 , MORTAR, MOLTEN, FURNACE, EXTRUDER_SIMPLE) .uumAloy( 0, Pb , 4*U, Sb , 1*U) , SolderingAlloy = clloy ( 8669, "Soldering Alloy" , 220, 220, 230 , MORTAR, MOLTEN, BRITTLE, SOLDERING_MATERIAL, SOLDERING_MATERIAL_GOOD, WIRES) .uumAloy( 0, Sn , 9*U, Sb , 1*U) , IronWood = alloymachine ( 8672, "Ironwood" , SET_WOOD , 150, 140, 110 , MAGICAL, WOOD, FURNACE, EXTRUDER_SIMPLE, MORTAR, MAGNETIC_PASSIVE, MOLTEN, "IronWood").qual(2, 6.5, 512, 2) .setAloy(18, WroughtIron , 8*U, LiveRoot , 9*U, Angmallen , 2*U) .aspects(TC.METALLUM, 2, TC.ARBOR, 1, TC.PRAECANTIO, 1), - Steeleaf = alloymachine ( 8673, "Steeleaf" , SET_LEAF , 50, 127, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, WOOD, MORTAR).qual(2, 8.0, 144, 3).setSmelting(Steel, U4) .setMcfg( 1, Steel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.HERBA, 1, TC.PRAECANTIO, 1), + Steeleaf = alloymachine ( 8673, "Steeleaf" , SET_LEAF , 50, 127, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, AUTO_COLLECTING, WOOD, MORTAR).qual(2, 8.0, 144, 3).setSmelting(Steel, U4) .setMcfg( 1, Steel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.HERBA, 1, TC.PRAECANTIO, 1), Knightmetal = alloymachine ( 8674, "Knightmetal" , 210, 240, 200 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN, MORTAR, "KnightMetal").qual(3, 8.0, 512, 3) .setMcfg( 2, Steel , 2*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.TELUM, 1, TC.PRAECANTIO, 1).heat(Steel.mMeltingPoint+100, Steel.mBoilingPoint+100), FierySteel = alloymachine ( 8675, "Fiery Steel" , SET_FIERY , 64, 0, 0 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING, "Fiery").qual(3, 9.0, 1024, 4) .setMcfg( 1, Steel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1).heat(Steel.mBoilingPoint-200, Steel.mBoilingPoint+500), - Fireleaf = alloymachine ( 8698, "Fireleaf" , SET_LEAF , 127, 50, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, WOOD, MORTAR).qual(2, 12.0, 288, 4).setSmelting(FierySteel, U4) .setMcfg( 1, FierySteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.HERBA, 1), - MeteoflameSteel = alloymachine ( 8693, "Meteoflame Steel" , SET_FIERY , 130, 120, 100 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 12.0, 1280, 4) .setMcfg( 1, MeteoricSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1).heat(MeteoricSteel.mBoilingPoint-200, MeteoricSteel.mBoilingPoint+500), - MeteoflameBlackSteel = alloymachine ( 8694, "Meteoflame Black Steel", SET_FIERY , 85, 85, 85 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 12.0, 1280, 4) .setMcfg( 1, MeteoricBlackSteel, 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricBlackSteel.mBoilingPoint-200, MeteoricBlackSteel.mBoilingPoint+500), - MeteoflameBlueSteel = alloymachine ( 8695, "Meteoflame Blue Steel" , SET_FIERY , 95, 95, 135 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 13.0, 1408, 4) .setMcfg( 1, MeteoricBlueSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricBlueSteel .mBoilingPoint-200, MeteoricBlueSteel .mBoilingPoint+500), - MeteoflameRedSteel = alloymachine ( 8696, "Meteoflame Red Steel" , SET_FIERY , 135, 95, 95 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 14.0, 1536, 4) .setMcfg( 1, MeteoricRedSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricRedSteel .mBoilingPoint-200, MeteoricRedSteel .mBoilingPoint+500), + Fireleaf = alloymachine ( 8698, "Fireleaf" , SET_LEAF , 127, 50, 50 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, AUTO_COLLECTING, WOOD, MORTAR).qual(2, 12.0, 288, 4).setSmelting(FierySteel, U4) .setMcfg( 1, FierySteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.HERBA, 1), + MeteoflameSteel = alloymachine ( 8693, "Meteoflame Steel" , SET_FIERY , 130, 120, 100 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING, AUTO_COLLECTING).qual(3, 12.0, 1280, 4) .setMcfg( 1, MeteoricSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1).heat(MeteoricSteel.mBoilingPoint-200, MeteoricSteel.mBoilingPoint+500), + MeteoflameBlackSteel = alloymachine ( 8694, "Meteoflame Black Steel", SET_FIERY , 85, 85, 85 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING, AUTO_COLLECTING).qual(3, 12.0, 1280, 4) .setMcfg( 1, MeteoricBlackSteel, 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricBlackSteel.mBoilingPoint-200, MeteoricBlackSteel.mBoilingPoint+500), + MeteoflameBlueSteel = alloymachine ( 8695, "Meteoflame Blue Steel" , SET_FIERY , 95, 95, 135 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING, AUTO_COLLECTING).qual(3, 13.0, 1408, 4) .setMcfg( 1, MeteoricBlueSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricBlueSteel .mBoilingPoint-200, MeteoricBlueSteel .mBoilingPoint+500), + MeteoflameRedSteel = alloymachine ( 8696, "Meteoflame Red Steel" , SET_FIERY , 135, 95, 95 , MAGICAL, CENTRIFUGE, MAGNETIC_ACTIVE , MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING, AUTO_COLLECTING).qual(3, 14.0, 1536, 4) .setMcfg( 1, MeteoricRedSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.MAGNETO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1).heat(MeteoricRedSteel .mBoilingPoint-200, MeteoricRedSteel .mBoilingPoint+500), FlamascusSteel = alloymachine ( 8697, "Flamascus Steel" , SET_FIERY , 110, 110, 110 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN, WITHER_PROOF, UNBURNABLE, BURNING, GLOWING).qual(3, 12.0, 1280, 4) .setMcfg( 1, DamascusSteel , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.IGNIS, 3, TC.PRAECANTIO, 1, TC.ORDO, 1, TC.INSTRUMENTUM, 1, TC.TELUM, 1).heat(DamascusSteel.mBoilingPoint-200, DamascusSteel.mBoilingPoint+500), Thaumium = alloymachore ( 8679, "Thaumium" , 150, 100, 200 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN).qual(3, 12.0, 256, 3) .setMcfg( 1, Fe , 1*U, Ma , 1*U) .aspects(TC.METALLUM, 2, TC.PRAECANTIO, 1).heat(Fe.mMeltingPoint+500, Fe.mBoilingPoint+1000), DarkThaumium = alloymachine ( 8680, "Dark Thaumium" , 100, 75, 75 , MAGICAL, CENTRIFUGE, MAGNETIC_PASSIVE, MOLTEN, WARPING).qual(3, 12.0, 512, 3) .aspects(TC.METALLUM, 2, TC.TENEBRAE, 1).heat(Thaumium), @@ -1834,8 +1834,8 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { AncientDebris = metalore ( 8744, "Ancient Debris" , SET_SPACE , 110, 80, 90 , "Ancient", UNBURNABLE, MAGNETIC_PASSIVE, WITHER_PROOF, MOLTEN, VALUABLE, WASHING_MERCURY).qual(0, 1.0, 16, 3) .aspects(TC.METALLUM, 2, TC.ALIENIS, 2).heat(MeteoricIron), - Netherite = alloymachine ( 8745, "Netherite" , 80, 70, 80 , UNBURNABLE, MAGNETIC_ACTIVE , WITHER_PROOF, MOLTEN, VALUABLE).qual(2, 10.0, 500, 4) .setAloy( 1, Au , 4*U, AncientDebris , 4*U) .aspects(TC.METALLUM, 2, TC.ALIENIS, 2, TC.LUCRUM, 2).heat(MeteoricSteel), - NetherizedDiamond = alloymachine ( 8746, "Netherized Diamond" , SET_DIAMOND , 90, 80, 90 , G_GEM , UNBURNABLE, MAGNETIC_ACTIVE , WITHER_PROOF, COATED, VALUABLE).qual(3, 12.0, 2560, 4) .setMcfg( 4, Netherite , 1*U, Diamond , 4*U) .aspects(TC.METALLUM, 2, TC.ALIENIS, 2, TC.LUCRUM, 2, TC.VITREUS, 2).heat(MeteoricSteel), + Netherite = alloymachine ( 8745, "Netherite" , 80, 70, 80 , UNBURNABLE, MAGNETIC_ACTIVE , WITHER_PROOF, MOLTEN, VALUABLE, AUTO_COLLECTING).qual(2, 10.0, 500, 4) .setAloy( 1, Au , 4*U, AncientDebris , 4*U) .aspects(TC.METALLUM, 2, TC.ALIENIS, 2, TC.LUCRUM, 2).heat(MeteoricSteel), + NetherizedDiamond = alloymachine ( 8746, "Netherized Diamond" , SET_DIAMOND , 90, 80, 90 , G_GEM , UNBURNABLE, MAGNETIC_ACTIVE , WITHER_PROOF, COATED, VALUABLE, AUTO_COLLECTING).qual(3, 12.0, 2560, 4) .setMcfg( 4, Netherite , 1*U, Diamond , 4*U) .aspects(TC.METALLUM, 2, TC.ALIENIS, 2, TC.LUCRUM, 2, TC.VITREUS, 2).heat(MeteoricSteel), Efrine = metalore ( 8747, "Efrine" , 80, 107, 72 , UNBURNABLE, MAGNETIC_PASSIVE, WITHER_PROOF, MOLTEN, WASHING_MERCURY).qual(3, 9.0, 500, 3) .aspects(TC.METALLUM, 2, TC.GELUM, 2).heat(MeteoricSteel), @@ -1847,7 +1847,7 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { Oriharukon = metalmachore ( 8754, "Oriharukon" , 220, 220, 240 ).qual(3, 8.0, 2560, 2) .aspects(TC.METALLUM, 2, TC.MACHINA, 2), Adamantite = metalmachore ( 8755, "Adamantite" , 255, 255, 190 ).qual(3, 6.0, 2560, 3) .aspects(TC.METALLUM, 2, TC.TUTAMEN, 2), Duralumin = alloymachine ( 8756, "Duralumin" , SET_DULL , 255, 255, 220 ).qual(3, 10.0, 512, 2) .uumMcfg( 0, Al , 1*U, Cu , 1*U) .aspects(TC.METALLUM, 2, TC.PERMUTATIO, 1, TC.VOLATUS, 1), - Meteorite = metalmachore ( 8757, "Meteorite" , SET_SPACE , 222, 100, 222 , MOLTEN, MAGNETIC_ACTIVE, RAILS, DECOMPOSABLE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ALIENIS, 1).steal(MeteoricIron).qual(3, 8.0, 1200, 3), + Meteorite = metalmachore ( 8757, "Meteorite" , SET_SPACE , 222, 100, 222 , MOLTEN, MAGNETIC_ACTIVE, AUTO_COLLECTING, RAILS, DECOMPOSABLE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.MAGNETO, 1, TC.ALIENIS, 1).steal(MeteoricIron).qual(3, 8.0, 1200, 3), FrozenIron = metalmachore ( 8758, "Frozen Iron" , SET_DULL , 235, 235, 255 , DECOMPOSABLE, MAGNETIC_PASSIVE) .uumMcfg( 0, Fe , 1*U) .aspects(TC.METALLUM, 2, TC.GELUM, 2).steal(Fe).setSmelting(Fe, U).setForging(Fe, U), Kreknorite = metalmachore ( 8759, "Kreknorite" , SET_SPACE , 128, 0, 0 , MOLTEN, TICKS_PER_SMELT*18) .aspects(TC.METALLUM, 2, TC.IGNIS, 2).qual(3, 8.0, 1200, 3).heat(MeteoricSteel.mMeltingPoint + 200, MeteoricSteel.mBoilingPoint + 200), Syrmorite = metalmachore ( 8785, "Syrmorite" , SET_DULL , 80, 80, 199 , MOLTEN) .aspects(TC.METALLUM, 2, TC.MORTUUS, 1).qual(2, 6.0, 500, 1).heat(Au), @@ -1868,7 +1868,7 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { CrystalMatrix = slloymachine ( 8799, "Crystal Matrix" , 83, 231, 234 , UNBURNABLE, WITHER_PROOF, ENDER_DRAGON_PROOF, VALUABLE, MAGICAL).qual(3, 20.0, 25600, 4) .setMcfg( 1, Diamond ,20*U, NetherStar , 2*U) .aspects(TC.VITREUS, 8, TC.PRAECANTIO, 4, TC.NEBRISUM, 4).heat(3896, 5127), CosmicNeutronium = setalmachine ( 8800, "Cosmic Neutronium" , 30, 10, 40 , UNBURNABLE, WITHER_PROOF, ENDER_DRAGON_PROOF, VALUABLE, MAGICAL).qual(3, 50.0, 100000, 10) .aspects(TC.POTENTIA, 10, TC.NEBRISUM, 10, TC.RADIO, 10, TC.TENEBRAE, 10, TC.TERRA, 10).heat(100000), - Infinity = setalmachine ( 8801, "Infinity" , 250, 250, 250 , UNBURNABLE, WITHER_PROOF, ENDER_DRAGON_PROOF, VALUABLE, MAGICAL, GLOWING, LIGHTING, MAGNETIC_ACTIVE).qual(3,1000000000.0,1000000000, 15) .aspects(TC.POTENTIA, 10, TC.NEBRISUM, 10, TC.PERMUTATIO, 10, TC.MAGNETO, 10, TC.PRAECANTIO, 10, TC.AURAM, 10).heat(100000), + Infinity = setalmachine ( 8801, "Infinity" , 250, 250, 250 , UNBURNABLE, WITHER_PROOF, ENDER_DRAGON_PROOF, VALUABLE, MAGICAL, GLOWING, LIGHTING, MAGNETIC_ACTIVE, AUTO_COLLECTING).qual(3,1000000000.0,1000000000, 15) .aspects(TC.POTENTIA, 10, TC.NEBRISUM, 10, TC.PERMUTATIO, 10, TC.MAGNETO, 10, TC.PRAECANTIO, 10, TC.AURAM, 10).heat(100000), Unstable = setal ( 8805, "Unstable" , 255, 255, 255, 128, AUTO_BLACKLIST, EXPLODES_IN_NONVANILLA_CRAFTING_GRID, "Unstableingot") .aspects(TC.PERDITIO, 4), @@ -4017,7 +4017,7 @@ public static class UNUSED { Weidanium = unused ("Weidanium" ).setPriorityPrefix(3).put(G_INGOT_ORES, MD.HBM), // Weidite Ore Verticium = unused ("Verticium" ).setPriorityPrefix(3).put(G_INGOT_ORES, MD.HBM), Australium = unused ("Australium" ).setPriorityPrefix(3).put(G_INGOT_ORES, MD.HBM), - Schrabidium = unused ("Schrabidium" ).setPriorityPrefix(3).put(G_INGOT_ORES, MD.HBM, MAGNETIC_ACTIVE, MELTING, MOLTEN).setRGBa( 50, 255, 255, 255), + Schrabidium = unused ("Schrabidium" ).setPriorityPrefix(3).put(G_INGOT_ORES, MD.HBM, MAGNETIC_ACTIVE, AUTO_COLLECTING, MELTING, MOLTEN).setRGBa( 50, 255, 255, 255), Starmetal = unused ("Starmetal" ).setPriorityPrefix(3).put(G_INGOT_MACHINE_ORES, MD.HBM), Unobtainium = unused ("Unobtainium" ).setPriorityPrefix(3).put(G_INGOT_MACHINE_ORES, MD.HBM), CMBSteel = unused ("CMB Steel" ).setPriorityPrefix(3).put(G_INGOT_MACHINE, MD.HBM), @@ -4025,7 +4025,7 @@ public static class UNUSED { AdvancedAlloy = unused ("Advanced Alloy" ).setPriorityPrefix(3).put(G_INGOT_MACHINE, MD.HBM), Saturnite = unused ("Saturnite" ).setPriorityPrefix(3).put(G_INGOT_MACHINE, MD.HBM), Dineutronium = unused ("Dineutronium" ).setPriorityPrefix(3).put(G_INGOT_MACHINE, MD.HBM), - MagnetizedTungsten = unused ("Magnetized Tungsten" ).setPriorityPrefix(3).put(G_INGOT, MD.HBM, MAGNETIC_ACTIVE), + MagnetizedTungsten = unused ("Magnetized Tungsten" ).setPriorityPrefix(3).put(G_INGOT, MD.HBM, MAGNETIC_ACTIVE, AUTO_COLLECTING), Euphemium = unused ("Euphemium" ).setPriorityPrefix(3).put(G_INGOT, MD.HBM, MELTING, MOLTEN).setRGBa(255, 150, 255, 255), Rupee = unused ("Rupee" ).put(MD.DRPG), Arlemite = unused ("Arlemite" ).put(MD.DRPG), diff --git a/src/main/java/gregapi/data/TD.java b/src/main/java/gregapi/data/TD.java index 615518a37..c39ab7c4c 100644 --- a/src/main/java/gregapi/data/TD.java +++ b/src/main/java/gregapi/data/TD.java @@ -438,6 +438,8 @@ public static class Properties { public static final TagData MAGNETIC_PASSIVE = TagData.createTagData("PROPERTIES.MAGNETIC_PASSIVE", "Passively Magnetic"); /** If this Material is actively Magnetic */ public static final TagData MAGNETIC_ACTIVE = TagData.createTagData("PROPERTIES.MAGNETIC_ACTIVE", "Actively Magnetic"); + /** If this Material is making Tools auto-collect */ + public static final TagData AUTO_COLLECTING = TagData.createTagData("PROPERTIES.AUTO_COLLECTING", "Auto-Collecting"); /** If this Material is Ender Dragon Proof. */ public static final TagData ENDER_DRAGON_PROOF = TagData.createTagData("PROPERTIES.ENDER_DRAGON_PROOF", "Ender Dragon Proof"); /** If this Material is Wither Proof. */ @@ -466,9 +468,9 @@ public static class Properties { public static final TagData DONT_SHOW_THIS_COMPONENT = TagData.createTagData("PROPERTIES.DONT_SHOW_THIS_COMPONENT", "Not shown as Component"); /** Contains all known Property Tags. */ - public static final List ALL = new ArrayListNoNulls<>(Arrays.asList(ACID, WOOD, FOOD, MEAT, ROTTEN, COAL, STONE, PEARL, QUARTZ, CRYSTAL, MAGICAL, WARPING, VALUABLE, BURNING, FLAMMABLE, UNBURNABLE, EXPLOSIVE, BOUNCY, GLOWING, MAGNETIC_ACTIVE, MAGNETIC_PASSIVE, BETWEENLANDS, MAZEBREAKER, LIGHTING, BRITTLE, STRETCHY, INVISIBLE, TRANSPARENT, ENDER_DRAGON_PROOF, WITHER_PROOF, EXPLODES_IN_NONVANILLA_CRAFTING_GRID, HAS_COLOR, AUTO_BLACKLIST, AUTO_MATERIAL, INVALID_MATERIAL, IGNORE_IN_COLOR_LOG, UNUSED_MATERIAL, DONT_SHOW_THIS_COMPONENT)); + public static final List ALL = new ArrayListNoNulls<>(Arrays.asList(ACID, WOOD, FOOD, MEAT, ROTTEN, COAL, STONE, PEARL, QUARTZ, CRYSTAL, MAGICAL, WARPING, VALUABLE, BURNING, FLAMMABLE, UNBURNABLE, EXPLOSIVE, BOUNCY, GLOWING, AUTO_COLLECTING, MAGNETIC_ACTIVE, MAGNETIC_PASSIVE, BETWEENLANDS, MAZEBREAKER, LIGHTING, BRITTLE, STRETCHY, INVISIBLE, TRANSPARENT, ENDER_DRAGON_PROOF, WITHER_PROOF, EXPLODES_IN_NONVANILLA_CRAFTING_GRID, HAS_COLOR, AUTO_BLACKLIST, AUTO_MATERIAL, INVALID_MATERIAL, IGNORE_IN_COLOR_LOG, UNUSED_MATERIAL, DONT_SHOW_THIS_COMPONENT)); /** Contains all relevant Property Tags. */ - public static final List ALL_RELEVANTS = new ArrayListNoNulls<>(Arrays.asList(ACID, WOOD, FOOD, MEAT, ROTTEN, COAL, STONE, PEARL, QUARTZ, CRYSTAL, MAGICAL, WARPING, VALUABLE, BURNING, FLAMMABLE, UNBURNABLE, EXPLOSIVE, BOUNCY, GLOWING, MAGNETIC_ACTIVE, MAGNETIC_PASSIVE, BETWEENLANDS, MAZEBREAKER, BRITTLE, STRETCHY, INVISIBLE, TRANSPARENT, ENDER_DRAGON_PROOF, WITHER_PROOF, EXPLODES_IN_NONVANILLA_CRAFTING_GRID)); + public static final List ALL_RELEVANTS = new ArrayListNoNulls<>(Arrays.asList(ACID, WOOD, FOOD, MEAT, ROTTEN, COAL, STONE, PEARL, QUARTZ, CRYSTAL, MAGICAL, WARPING, VALUABLE, BURNING, FLAMMABLE, UNBURNABLE, EXPLOSIVE, BOUNCY, GLOWING, AUTO_COLLECTING, MAGNETIC_ACTIVE, MAGNETIC_PASSIVE, BETWEENLANDS, MAZEBREAKER, BRITTLE, STRETCHY, INVISIBLE, TRANSPARENT, ENDER_DRAGON_PROOF, WITHER_PROOF, EXPLODES_IN_NONVANILLA_CRAFTING_GRID)); } /** Describing the kind of binding the Compound Material is having */ diff --git a/src/main/java/gregapi/item/multiitem/MultiItemTool.java b/src/main/java/gregapi/item/multiitem/MultiItemTool.java index 7479a37ec..910ebc330 100644 --- a/src/main/java/gregapi/item/multiitem/MultiItemTool.java +++ b/src/main/java/gregapi/item/multiitem/MultiItemTool.java @@ -214,7 +214,7 @@ public void onHarvestBlockEvent(ArrayList aDrops, ItemStack aStack, E public boolean canCollectDropsDirectly(ItemStack aStack) { IToolStats tStats = getToolStats(aStack); - return (tStats.canCollect() || getPrimaryMaterial(aStack).contains(TD.Properties.MAGNETIC_ACTIVE) || getSecondaryMaterial(aStack).contains(TD.Properties.MAGNETIC_ACTIVE)) && isItemStackUsable(aStack); + return (tStats.canCollect() || getPrimaryMaterial(aStack).contains(TD.Properties.AUTO_COLLECTING) || getSecondaryMaterial(aStack).contains(TD.Properties.AUTO_COLLECTING)) && isItemStackUsable(aStack); } public boolean canCollectDropsDirectly(ItemStack aStack, Block aBlock, byte aMeta) { if (ST.instaharvest(aBlock, aMeta)) return T; @@ -337,7 +337,7 @@ public void addAdditionalToolTips(List aList, ItemStack aStack, boolean if (canHarvestBlock(IL.TF_Towerwood.block(), aStack)) aList.add(LH.Chat.PINK + LH.get(LH.TOOLTIP_TWILIGHT_TOWER_WOOD_BREAKING)); } if (tMat1.contains(TD.Properties.UNBURNABLE) || tMat2.contains(TD.Properties.UNBURNABLE)) aList.add(LH.Chat.GREEN + LH.get(LH.TOOLTIP_UNBURNABLE)); - if (tStats.canCollect() || tMat1.contains(TD.Properties.MAGNETIC_ACTIVE) || tMat2.contains(TD.Properties.MAGNETIC_ACTIVE)) aList.add(LH.Chat.DGRAY + LH.get(LH.TOOLTIP_AUTOCOLLECT)); + if (tStats.canCollect() || tMat1.contains(TD.Properties.AUTO_COLLECTING) || tMat2.contains(TD.Properties.AUTO_COLLECTING)) aList.add(LH.Chat.DGRAY + LH.get(LH.TOOLTIP_AUTOCOLLECT)); if (tStats.canPenetrate()) aList.add(LH.Chat.DGRAY + LH.get(LH.TOOLTIP_ARMOR_PENETRATING)); } }