diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java | 32 | ||||
| -rw-r--r-- | src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java | 33 |
2 files changed, 0 insertions, 65 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java index 6c268ea2e6..82ad3aec82 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -5,8 +5,6 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.TextureSet.*; -import net.minecraft.util.EnumChatFormatting; - import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.util.Pair; @@ -16,9 +14,6 @@ import com.github.bartimaeusnek.bartworks.util.Pair; @SuppressWarnings("unchecked") public class BotWerkstoffMaterialPool implements Runnable { - private static final String DEPRECATED = EnumChatFormatting.DARK_RED - + "Deprecated; Will be removed in the next update"; - public static final Werkstoff TungsticAcid = new Werkstoff( new short[] { 0xf5, 0xf1, 0x16 }, "Tungstic Acid", @@ -133,15 +128,6 @@ public class BotWerkstoffMaterialPool implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), 29912, SET_FINE); - public static final Werkstoff LMP103S = new Werkstoff( - new short[] { 0xbf, 0x2f, 0xc2 }, - "LMP-103S", - DEPRECATED, - new Werkstoff.Stats(), - COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 29913, - SET_FINE); public static final Werkstoff OXylene = new Werkstoff( new short[] { 0x88, 0x94, 0xa8 }, "O-Xylene", @@ -241,24 +227,6 @@ public class BotWerkstoffMaterialPool implements Runnable { new Werkstoff.GenerationFeatures().disable().addCells(), 29928, SET_METALLIC); - public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff( - new short[] { 0x78, 0xe3, 0xa7 }, - "Monomethylhydrazine Fuel Mix", - DEPRECATED, - new Werkstoff.Stats(), - COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 29929, - SET_METALLIC); - public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff( - new short[] { 0xc8, 0xff, 0x00 }, - "Unsymmetrical Dimethylhydrazine Fuel Mix", - DEPRECATED, - new Werkstoff.Stats(), - COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - 29930, - SET_METALLIC); public static final Werkstoff Nitromethane = new Werkstoff( new short[] { 0x87, 0x7d, 0x60 }, "Nitromethane", diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index 14452dc0c9..b2c8605976 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -9,21 +9,16 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.Collection; import java.util.HashSet; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; @@ -508,34 +503,6 @@ public class BotRecipes { } public static void addFuels() { - try { - if (Loader.isModLoaded(GT_Values.MOD_ID_GC_CORE)) { - Class<?> rocket = Class.forName("micdoodle8.mods.galacticraft.api.recipe.RocketFuelRecipe"); - Method addFuel = rocket.getMethod("addFuel", Fluid.class, int.class); - addFuel.invoke(null, LMP103S.getFluidOrGas(1).getFluid(), 4); - addFuel.invoke(null, MonomethylhydrazineFuelMix.getFluidOrGas(1).getFluid(), 6); - addFuel.invoke(null, UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1).getFluid(), 8); - } - if (Loader.isModLoaded("miscutils")) { - Class<?> gtppRecipeMap = Class.forName("gregtech.api.util.GTPP_Recipe$GTPP_Recipe_Map"); - Field rocketFuels = gtppRecipeMap.getDeclaredField("sRocketFuels"); - rocketFuels.setAccessible(true); - Class<?> rocketFuelsClass = rocketFuels.getType(); - Object rocketFuelsObject = rocketFuels.get(null); - Method addFuel = rocketFuelsClass - .getDeclaredMethod("addFuel", FluidStack.class, FluidStack.class, int.class); - addFuel.invoke(rocketFuelsObject, LMP103S.getFluidOrGas(1000), null, 666); - addFuel.invoke(rocketFuelsObject, MonomethylhydrazineFuelMix.getFluidOrGas(1000), null, 1500); - addFuel.invoke( - rocketFuelsObject, - UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1000), - null, - 3000); - } - } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException - | NoSuchFieldException e) { - e.printStackTrace(); - } GT_Recipe.GT_Recipe_Map.sTurbineFuels.addFuel(TertButylbenzene.get(cell, 1), null, 420); } |