diff options
42 files changed, 248 insertions, 1067 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index ae1b20e3ce..87bd86f62c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -77,6 +77,7 @@ dependencies { compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.13:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.92-GTNH:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false } implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev") diff --git a/src/main/java/bartworks/API/WerkstoffAPI.java b/src/main/java/bartworks/API/WerkstoffAPI.java index d23ef1b75c..0a89e67550 100644 --- a/src/main/java/bartworks/API/WerkstoffAPI.java +++ b/src/main/java/bartworks/API/WerkstoffAPI.java @@ -14,22 +14,13 @@ package bartworks.API; import bartworks.system.material.Werkstoff; +import bartworks.system.material.WerkstoffLoader; public final class WerkstoffAPI { - @SuppressWarnings("rawtypes") - static Class w; - - static { - try { - w = Class.forName("bartworks.system.material.WerkstoffLoader"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } - public static Werkstoff getWerkstoff(String aName) throws NoSuchFieldException, IllegalAccessException { - return (Werkstoff) w.getField(aName) + return (Werkstoff) WerkstoffLoader.class.getField(aName) .get(null); } + } diff --git a/src/main/java/bartworks/system/material/WerkstoffLoader.java b/src/main/java/bartworks/system/material/WerkstoffLoader.java index d5c9337a7c..858fda7a58 100644 --- a/src/main/java/bartworks/system/material/WerkstoffLoader.java +++ b/src/main/java/bartworks/system/material/WerkstoffLoader.java @@ -152,25 +152,12 @@ public class WerkstoffLoader { public static final SubTag ANAEROBE_SMELTING = SubTag.getNewSubTag("AnaerobeSmelting"); public static final SubTag NOBLE_GAS_SMELTING = SubTag.getNewSubTag("NobleGasSmelting"); public static final SubTag NO_BLAST = SubTag.getNewSubTag("NoBlast"); - public static ItemList rotorMold; - public static ItemList rotorShape; - public static ItemList smallGearShape; - public static ItemList ringMold; - public static ItemList boltMold; public static void setUp() { OrePrefixes.cellMolten.mMaterialGenerationBits = 0b1000000; OrePrefixes.capsuleMolten.mMaterialGenerationBits = 0b1000000; - try { - WerkstoffLoader.rotorMold = Enum.valueOf(ItemList.class, "Shape_Mold_Rotor"); - WerkstoffLoader.rotorShape = Enum.valueOf(ItemList.class, "Shape_Extruder_Rotor"); - WerkstoffLoader.smallGearShape = Enum.valueOf(ItemList.class, "Shape_Extruder_Small_Gear"); - WerkstoffLoader.ringMold = Enum.valueOf(ItemList.class, "Shape_Mold_Ring"); - WerkstoffLoader.boltMold = Enum.valueOf(ItemList.class, "Shape_Mold_Bolt"); - } catch (NullPointerException | IllegalArgumentException ignored) {} - // add tiberium EnumUtils.createNewElement("Tr", 123L, 203L, 0L, -1L, null, "Tiberium", false); diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java index a20996d463..5b5037ba08 100644 --- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java +++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java @@ -117,6 +117,8 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.common.blocks.BlockOresAbstract; +import gtPlusPlus.core.block.base.BlockBaseModular; +import gtPlusPlus.core.item.base.BaseItemComponent; public class PlatinumSludgeOverHaul { @@ -1053,25 +1055,14 @@ public class PlatinumSludgeOverHaul { } } - try { - if (Class.forName("gtPlusPlus.core.item.base.BaseItemComponent") - .isAssignableFrom( - stack.getItem() - .getClass()) - && !stack.getUnlocalizedName() - .contains("dust") - && !stack.getUnlocalizedName() - .contains("Dust")) { - return true; - } - if (Class.forName("gtPlusPlus.core.block.base.BlockBaseModular") - .isAssignableFrom( - Block.getBlockFromItem(stack.getItem()) - .getClass())) { - return true; - } - } catch (ClassNotFoundException e) { - e.printStackTrace(); + if (stack.getItem() instanceof BaseItemComponent && !stack.getUnlocalizedName() + .contains("dust") + && !stack.getUnlocalizedName() + .contains("Dust")) { + return true; + } + if (Block.getBlockFromItem(stack.getItem()) instanceof BlockBaseModular) { + return true; } if (stack.getItem() == HELICOPTER.getDust(1) .getItem()) { diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java index 022cf4c3e6..5512274260 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/CraftingMaterialLoader.java @@ -38,7 +38,6 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; import bartworks.system.material.Werkstoff; -import bartworks.system.material.WerkstoffLoader; import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; @@ -185,18 +184,14 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { .addTo(wiremillRecipes); // smallGear - if (WerkstoffLoader.smallGearShape != null) { - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot), WerkstoffLoader.smallGearShape.get(0L)) - .itemOutputs(werkstoff.get(gearGtSmall)) - .duration( - (int) werkstoff.getStats() - .getMass()) - .eut(8 * tVoltageMultiplier) - .addTo(extruderRecipes); - - } + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot), ItemList.Shape_Extruder_Small_Gear.get(0L)) + .itemOutputs(werkstoff.get(gearGtSmall)) + .duration( + (int) werkstoff.getStats() + .getMass()) + .eut(8 * tVoltageMultiplier) + .addTo(extruderRecipes); GTModHandler.addCraftingRecipe( werkstoff.get(gearGtSmall), @@ -234,16 +229,12 @@ public class CraftingMaterialLoader implements IWerkstoffRunnable { .eut(24) .addTo(assemblerRecipes); - if (WerkstoffLoader.rotorShape != null) { - - GTValues.RA.stdBuilder() - .itemInputs(werkstoff.get(ingot, 5), WerkstoffLoader.rotorShape.get(0L)) - .itemOutputs(werkstoff.get(rotor)) - .duration(10 * SECONDS) - .eut(60) - .addTo(extruderRecipes); - - } + GTValues.RA.stdBuilder() + .itemInputs(werkstoff.get(ingot, 5), ItemList.Shape_Extruder_Rotor.get(0L)) + .itemOutputs(werkstoff.get(rotor)) + .duration(10 * SECONDS) + .eut(60) + .addTo(extruderRecipes); // molten -> metal if (werkstoff.hasItemType(cellMolten)) { diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java index 8d639574cb..710f122592 100644 --- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java +++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/MoltenCellLoader.java @@ -300,12 +300,6 @@ public class MoltenCellLoader implements IWerkstoffRunnable { .getMass() > 128 ? 64 : 30) .addTo(fluidSolidifierRecipes); - // No Spring Molds - - if (WerkstoffLoader.rotorMold == null) { - return; - } - GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rotor.get(0)) .itemOutputs(werkstoff.get(rotor)) diff --git a/src/main/java/bartworks/util/CachedReflectionUtils.java b/src/main/java/bartworks/util/CachedReflectionUtils.java deleted file mode 100644 index a02b644b4a..0000000000 --- a/src/main/java/bartworks/util/CachedReflectionUtils.java +++ /dev/null @@ -1,31 +0,0 @@ -package bartworks.util; - -import java.lang.reflect.Field; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import org.apache.commons.lang3.reflect.FieldUtils; - -public class CachedReflectionUtils { - - private static final ClassValue<Map<String, Field>> fields = new ConcurrentMapClassValue(); - private static final ClassValue<Map<String, Field>> declaredFields = new ConcurrentMapClassValue(); - - public static Field getField(final Class<?> cls, final String fieldName) { - return fields.get(cls) - .computeIfAbsent(fieldName, f -> FieldUtils.getField(cls, f, true)); - } - - public static Field getDeclaredField(final Class<?> cls, final String fieldName) { - return declaredFields.get(cls) - .computeIfAbsent(fieldName, f -> FieldUtils.getDeclaredField(cls, f, true)); - } - - private static class ConcurrentMapClassValue extends ClassValue<Map<String, Field>> { - - @Override - protected Map<String, Field> computeValue(Class<?> type) { - return new ConcurrentHashMap<>(); - } - } -} diff --git a/src/main/java/bwcrossmod/GTpp/loader/RadioHatchCompat.java b/src/main/java/bwcrossmod/GTpp/loader/RadioHatchCompat.java index b410ec7e3e..9af6b96ba6 100644 --- a/src/main/java/bwcrossmod/GTpp/loader/RadioHatchCompat.java +++ b/src/main/java/bwcrossmod/GTpp/loader/RadioHatchCompat.java @@ -13,106 +13,34 @@ package bwcrossmod.GTpp.loader; -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import java.util.Map; -import java.util.Queue; -import java.util.Set; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.RegistryNamespaced; import net.minecraftforge.oredict.OreDictionary; -import bartworks.API.IRadMaterial; import bartworks.util.log.DebugLog; import bwcrossmod.BartWorksCrossmod; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Mods; +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.item.base.rods.BaseItemRod; +import gtPlusPlus.core.item.base.rods.BaseItemRodLong; +import gtPlusPlus.core.material.Material; public class RadioHatchCompat { - private static Class<?> intf; - private static Class<?> materialClass; - private static Class<?> enu; - private static Class<?> materialStackClass; - - private static Field isRadioactive; - private static Field f; - private static Field componentType; - private static Field radlevel; - private static Field protons; - - private static Field vMaterialInput; - private static Field stackMaterial; - private static Field RGBA; - private static Field localizedName; - private static Field unlocalizedName; - - private static Object rod; - private static Object longRod; - public static HashSet<String> TranslateSet = new HashSet<>(); - static { - try { - RadioHatchCompat.intf = Class.forName("gtPlusPlus.core.item.base.BaseItemComponent"); - RadioHatchCompat.enu = Class.forName("gtPlusPlus.core.item.base.BaseItemComponent$ComponentTypes"); - RadioHatchCompat.materialClass = Class.forName("gtPlusPlus.core.material.Material"); - RadioHatchCompat.materialStackClass = Class.forName("gtPlusPlus.core.material.MaterialStack"); - - RadioHatchCompat.f = RadioHatchCompat.intf.getField("componentMaterial"); - RadioHatchCompat.isRadioactive = RadioHatchCompat.materialClass.getField("isRadioactive"); - RadioHatchCompat.componentType = RadioHatchCompat.intf.getDeclaredField("componentType"); - RadioHatchCompat.radlevel = RadioHatchCompat.materialClass.getField("vRadiationLevel"); - - RadioHatchCompat.vMaterialInput = RadioHatchCompat.materialClass.getDeclaredField("vMaterialInput"); - RadioHatchCompat.stackMaterial = RadioHatchCompat.materialStackClass.getDeclaredField("stackMaterial"); - RadioHatchCompat.protons = RadioHatchCompat.materialClass.getDeclaredField("vProtons"); - RadioHatchCompat.RGBA = RadioHatchCompat.materialClass.getDeclaredField("RGBA"); - RadioHatchCompat.localizedName = RadioHatchCompat.materialClass.getDeclaredField("localizedName"); - RadioHatchCompat.unlocalizedName = RadioHatchCompat.materialClass.getDeclaredField("unlocalizedName"); - - RadioHatchCompat.vMaterialInput.setAccessible(true); - RadioHatchCompat.stackMaterial.setAccessible(true); - RadioHatchCompat.protons.setAccessible(true); - RadioHatchCompat.RGBA.setAccessible(true); - RadioHatchCompat.localizedName.setAccessible(true); - RadioHatchCompat.unlocalizedName.setAccessible(true); - - Object[] arr = RadioHatchCompat.enu.getEnumConstants(); - for (Object o : arr) { - if (RadioHatchCompat.rod != null && RadioHatchCompat.longRod != null) break; - if ("ROD".equalsIgnoreCase(o.toString())) RadioHatchCompat.rod = o; - else if ("RODLONG".equalsIgnoreCase(o.toString())) RadioHatchCompat.longRod = o; - } - - } catch (NoSuchFieldException | ClassNotFoundException e) { - e.printStackTrace(); - } - } - @SuppressWarnings("unchecked") public static void run() { DebugLog.log("Starting Generation of missing GT++ rods/longrods"); try { - Class<? extends Item> rodclass = (Class<? extends Item>) Class - .forName("gtPlusPlus.core.item.base.rods.BaseItemRod"); - Class<? extends Item> longrodclass = (Class<? extends Item>) Class - .forName("gtPlusPlus.core.item.base.rods.BaseItemRodLong"); - Constructor<? extends Item> c1 = rodclass.getConstructor(RadioHatchCompat.materialClass); - Constructor<? extends Item> c2 = longrodclass.getConstructor(RadioHatchCompat.materialClass); Field cOwners = GameData.class.getDeclaredField("customOwners"); cOwners.setAccessible(true); Field map = RegistryNamespaced.class.getDeclaredField("field_148758_b"); @@ -127,158 +55,42 @@ public class RadioHatchCompat { for (ModContainer container : Loader.instance() .getModList()) { if (gtpp != null && bartworks != null) break; - if (BartWorksCrossmod.MOD_ID.equalsIgnoreCase(container.getModId())) bartworks = container; - else if (container.getModId() - .equalsIgnoreCase(GTPlusPlus.ID)) gtpp = container; + if (BartWorksCrossmod.MOD_ID.equalsIgnoreCase(container.getModId())) { + bartworks = container; + } else if (Mods.GTPlusPlus.ID.equalsIgnoreCase(container.getModId())) { + gtpp = container; + } } - for (Object mats : (Set<?>) RadioHatchCompat.materialClass.getField("mMaterialMap") - .get(null)) { - if (RadioHatchCompat.isRadioactive.getBoolean(mats)) { - - if (OreDictionary.getOres("stick" + RadioHatchCompat.unlocalizedName.get(mats)) - .isEmpty()) { - Item it = c1.newInstance(mats); - UniqueIdentifierMap.replace(it, "miscutils:" + it.getUnlocalizedName()); - GameRegistry.UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(it); - ownerItems.replace(ui, bartworks, gtpp); - - String tanslate = it.getUnlocalizedName() + ".name=" - + RadioHatchCompat.localizedName.get(mats) - + " Rod"; - RadioHatchCompat.TranslateSet.add(tanslate); - - DebugLog.log(tanslate); - DebugLog.log("Generate: " + RadioHatchCompat.rod + RadioHatchCompat.unlocalizedName.get(mats)); - } - if (OreDictionary.getOres("stickLong" + RadioHatchCompat.unlocalizedName.get(mats)) - .isEmpty()) { - Item it2 = c2.newInstance(mats); - UniqueIdentifierMap.replace(it2, "miscutils:" + it2.getUnlocalizedName()); - GameRegistry.UniqueIdentifier ui2 = GameRegistry.findUniqueIdentifierFor(it2); - ownerItems.replace(ui2, bartworks, gtpp); + for (Material mats : Material.mMaterialMap) { + if (!mats.isRadioactive) continue; + + if (OreDictionary.getOres("stick" + mats.getUnlocalizedName()) + .isEmpty()) { + Item itemRod = new BaseItemRod(mats); + UniqueIdentifierMap.replace(itemRod, "miscutils:" + itemRod.getUnlocalizedName()); + GameRegistry.UniqueIdentifier ui = GameRegistry.findUniqueIdentifierFor(itemRod); + ownerItems.replace(ui, bartworks, gtpp); + String tanslate = itemRod.getUnlocalizedName() + ".name=" + mats.getLocalizedName() + " Rod"; + RadioHatchCompat.TranslateSet.add(tanslate); + DebugLog.log(tanslate); + DebugLog.log("Generate: " + BaseItemComponent.ComponentTypes.ROD + mats.getUnlocalizedName()); + } - DebugLog - .log("Generate: " + RadioHatchCompat.longRod + RadioHatchCompat.unlocalizedName.get(mats)); - } + if (OreDictionary.getOres("stickLong" + mats.getUnlocalizedName()) + .isEmpty()) { + Item itemRodLong = new BaseItemRodLong(mats); + UniqueIdentifierMap.replace(itemRodLong, "miscutils:" + itemRodLong.getUnlocalizedName()); + GameRegistry.UniqueIdentifier ui2 = GameRegistry.findUniqueIdentifierFor(itemRodLong); + ownerItems.replace(ui2, bartworks, gtpp); + DebugLog.log("Generate: " + BaseItemComponent.ComponentTypes.RODLONG + mats.getUnlocalizedName()); } - } - } catch (NoSuchFieldException | IllegalAccessException | NoSuchMethodException | InvocationTargetException - | InstantiationException | ClassNotFoundException e) { - e.printStackTrace(); - } - } - public static IRadMaterial GTppRadChecker(ItemStack lStack) { - try { - if (RadioHatchCompat.intf.isAssignableFrom( - lStack.getItem() - .getClass())) { - if (!RadioHatchCompat.isRadioactive.getBoolean(RadioHatchCompat.f.get(lStack.getItem()))) return null; - int amount = RadioHatchCompat.componentType.get(lStack.getItem()) - .equals(RadioHatchCompat.rod) ? 1 - : RadioHatchCompat.componentType.get(lStack.getItem()) - .equals(RadioHatchCompat.longRod) ? 2 : 0; - if (amount == 0) return null; - return new RadioHatchCompat.GTPPRadAdapter(amount, RadioHatchCompat.f.get(lStack.getItem())); } - } catch (IllegalAccessException e) { + + } catch (NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); } - return null; } - static class GTPPRadAdapter implements IRadMaterial { - - static final HashMap<Object, Integer> BUFFER = new HashMap<>(); - - GTPPRadAdapter(Object m) { - this.m = m; - } - - GTPPRadAdapter(int amount, Object m) { - this.amount = (byte) amount; - this.m = m; - } - - byte amount; - final Object m; - - private static ArrayList<?> getMaterialInput(Object GTPPMaterial) throws IllegalAccessException { - Object ret = RadioHatchCompat.vMaterialInput.get(GTPPMaterial); - return ret instanceof ArrayList ? (ArrayList<?>) ret : new ArrayList<>(); - } - - private static boolean isElement(Object GTPPMaterial) throws IllegalAccessException { - return RadioHatchCompat.GTPPRadAdapter.getMaterialInput(GTPPMaterial) - .isEmpty(); - } - - private static List<?> getElemets(Object GTPPMaterial) throws IllegalAccessException { - ArrayList<Object> elements = new ArrayList<>(); - Queue<Object> toCheck = new LinkedList<>(); - ArrayList<?> materialInputs = RadioHatchCompat.GTPPRadAdapter.getMaterialInput(GTPPMaterial); - if (materialInputs.isEmpty()) return Collections.singletonList(GTPPMaterial); - for (Object materialStack : materialInputs) { - if (!RadioHatchCompat.GTPPRadAdapter.isElement(RadioHatchCompat.stackMaterial.get(materialStack))) - toCheck.add(RadioHatchCompat.stackMaterial.get(materialStack)); - else elements.add(RadioHatchCompat.stackMaterial.get(materialStack)); - } - while (!toCheck.isEmpty()) { - elements.addAll(GTPPRadAdapter.getElemets(toCheck.poll())); - } - return elements; - } - - private static Integer calulateRad(Object m) { - int ret = 0; - try { - List<?> pureElements = RadioHatchCompat.GTPPRadAdapter.getElemets(m); - for (Object materialObj : pureElements) if (RadioHatchCompat.isRadioactive.getBoolean(materialObj)) - ret += RadioHatchCompat.radlevel.getByte(m) - + RadioHatchCompat.GTPPRadAdapter.clampToZero(RadioHatchCompat.protons.getLong(materialObj)); - else ret += RadioHatchCompat.radlevel.getByte(m); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - return ret; - } - - @Override - public int getRadiationLevel(ItemStack aStack) { - return RadioHatchCompat.GTPPRadAdapter.BUFFER - .computeIfAbsent(this.m, radlvl -> RadioHatchCompat.GTPPRadAdapter.calulateRad(this.m)); - } - - private static long clampToZero(long number) { - return number > 0 ? number : 0; - } - - @Override - public byte getAmountOfMaterial(ItemStack aStack) { - return this.amount; - } - - @Override - public short[] getColorForGUI(ItemStack aStack) { - short[] rgba = { 0, 0, 0, 0 }; - try { - rgba = (short[]) RadioHatchCompat.RGBA.get(this.m); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - return rgba; - } - - @Override - public String getNameForGUI(ItemStack aStack) { - String ret = ""; - try { - ret = (String) RadioHatchCompat.localizedName.get(this.m); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - return ret; - } - } } diff --git a/src/main/java/gregtech/api/GregTechAPI.java b/src/main/java/gregtech/api/GregTechAPI.java index 6cabb8e04c..e10c773579 100644 --- a/src/main/java/gregtech/api/GregTechAPI.java +++ b/src/main/java/gregtech/api/GregTechAPI.java @@ -26,7 +26,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -47,10 +46,6 @@ import gregtech.api.interfaces.internal.IGTRecipeAdder; import gregtech.api.interfaces.internal.IThaumcraftCompat; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable; -import gregtech.api.items.GTGenericItem; -import gregtech.api.items.ItemCoolantCell; -import gregtech.api.items.ItemCoolantCellIC; -import gregtech.api.items.ItemTool; import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.objects.GTCoverDefault; import gregtech.api.objects.GTCoverNone; @@ -287,20 +282,7 @@ public class GregTechAPI { static { sItemStackMappings.add(sCovers); sItemStackMappings.add(sCoverBehaviors); - dummyWorlds.add(GTDummyWorld.class); - tryAddDummyWorld("blockrenderer6343.client.world.DummyWorld"); - } - - private static void tryAddDummyWorld(String className) { - ClassLoader cl = GregTechAPI.class.getClassLoader(); - Class<?> clazz; - try { - clazz = Class.forName(className, false, cl); - } catch (ReflectiveOperationException ex) { - return; - } - dummyWorlds.add(clazz); } public static void addDummyWorld(Class<?> clazz) { @@ -408,284 +390,6 @@ public class GregTechAPI { } /** - * Creates a new Coolant Cell Item for your Nuclear Reactor - */ - public static Item constructCoolantCellItem(String aUnlocalized, String aEnglish, int aMaxStore) { - try { - return new ItemCoolantCellIC(aUnlocalized, aEnglish, aMaxStore); - } catch (Throwable e) { - /* Do nothing */ - } - try { - return new ItemCoolantCell(aUnlocalized, aEnglish, aMaxStore); - } catch (Throwable e) { - /* Do nothing */ - } - return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug"); - } - - /** - * Creates a new Energy Armor Item - */ - public static Item constructElectricArmorItem(String aUnlocalized, String aEnglish, int aCharge, int aTransfer, - int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, - int aType, int aArmorIndex) { - try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aCharge, - aTransfer, - aTier, - aDamageEnergyCost, - aSpecials, - aArmorAbsorbtionPercentage, - aChargeProvider, - aType, - aArmorIndex); - } catch (Throwable e) { - /* Do nothing */ - } - try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aCharge, - aTransfer, - aTier, - aDamageEnergyCost, - aSpecials, - aArmorAbsorbtionPercentage, - aChargeProvider, - aType, - aArmorIndex); - } catch (Throwable e) { - /* Do nothing */ - } - return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug"); - } - - /** - * Creates a new Energy Battery Item - */ - public static Item constructElectricEnergyStorageItem(String aUnlocalized, String aEnglish, int aCharge, - int aTransfer, int aTier, int aEmptyID, int aFullID) { - try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); - } catch (Throwable e) { - /* Do nothing */ - } - try { - return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID); - } catch (Throwable e) { - /* Do nothing */ - } - return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug"); - } - - /** - * Creates a new Hard Hammer Item - */ - public static ItemTool constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_HardHammer_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new Crowbar Item - */ - public static ItemTool constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); - } catch (Throwable e) { - /* Do nothing */ - } - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_Crowbar_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new Wrench Item - */ - public static ItemTool constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage, - int aDisChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_Wrench_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new electric Screwdriver Item - */ - public static ItemTool constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage, int aDisChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new electric Wrench Item - */ - public static ItemTool constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage, int aDisChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new electric Saw Item - */ - public static ItemTool constructElectricSawItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, - int aDisChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_SawIC_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage, - aToolQuality, - aToolStrength, - aEnergyConsumptionPerBlockBreak, - aDisChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new electric Drill Item - */ - public static ItemTool constructElectricDrillItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, - int aDisChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_DrillIC_Item") - .getConstructors()[0].newInstance( - aUnlocalized, - aEnglish, - aMaxDamage, - aEntityDamage, - aToolQuality, - aToolStrength, - aEnergyConsumptionPerBlockBreak, - aDisChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new electric Soldering Tool - */ - public static ItemTool constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aEntityDamage, int aDisChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool( - aUnlocalized, - aEnglish, - "Doesn't work as intended, this is a Bug", - aMaxDamage, - aEntityDamage, - false); - } - - /** - * Creates a new empty electric Tool - */ - public static ItemTool constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage, - int aChargedGTID) { - try { - return (ItemTool) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item") - .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID); - } catch (Throwable e) { - /* Do nothing */ - } - return new ItemTool(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, 0, false); - } - - /** * Provides a new BaseMetaTileEntity. Because some interfaces are not always loaded (Buildcraft, Universal * Electricity) we have to use invocation at the constructor of the BaseMetaTileEntity. */ diff --git a/src/main/java/gregtech/api/objects/GTChunkManager.java b/src/main/java/gregtech/api/objects/GTChunkManager.java index 59bc90aa1c..436fd0d7d8 100644 --- a/src/main/java/gregtech/api/objects/GTChunkManager.java +++ b/src/main/java/gregtech/api/objects/GTChunkManager.java @@ -111,7 +111,7 @@ public class GTChunkManager if (!GTValues.enableChunkloaders) return false; if (!GTValues.alwaysReloadChunkloaders && chunkXZ == null) return false; if (GTValues.debugChunkloaders && chunkXZ != null) - GTLog.out.println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); + GTLog.out.println("GTChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); if (instance.registeredTickets.containsKey(owner)) { ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ); } else { @@ -122,11 +122,11 @@ public class GTChunkManager .requestPlayerTicket(GTMod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL); if (ticket == null) { if (GTValues.debugChunkloaders) - GTLog.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed"); + GTLog.out.println("GTChunkManager: ForgeChunkManager.requestTicket failed"); return false; } if (GTValues.debugChunkloaders) GTLog.out.println( - "GT_ChunkManager: ticket issued for machine at: (" + owner.xCoord + "GTChunkManager: ticket issued for machine at: (" + owner.xCoord + ", " + owner.yCoord + ", " @@ -154,7 +154,7 @@ public class GTChunkManager Ticket ticket = instance.registeredTickets.get(owner); if (ticket != null) { if (GTValues.debugChunkloaders) GTLog.out - .println("GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); + .println("GTChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")"); ForgeChunkManager.unforceChunk(ticket, chunkXZ); } } @@ -165,14 +165,14 @@ public class GTChunkManager if (ticket != null) { if (GTValues.debugChunkloaders) { GTLog.out.println( - "GT_ChunkManager: ticket released by machine at: (" + owner.xCoord + "GTChunkManager: ticket released by machine at: (" + owner.xCoord + ", " + owner.yCoord + ", " + owner.zCoord + ")"); for (ChunkCoordIntPair chunk : ticket.getChunkList()) GTLog.out - .println("GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")"); + .println("GTChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")"); } ForgeChunkManager.releaseTicket(ticket); instance.registeredTickets.remove(owner); @@ -180,10 +180,10 @@ public class GTChunkManager } public static void printTickets() { - GTLog.out.println("GT_ChunkManager: Start forced chunks dump:"); + GTLog.out.println("GTChunkManager: Start forced chunks dump:"); instance.registeredTickets.forEach((machine, ticket) -> { GTLog.out.print( - "GT_ChunkManager: Chunks forced by the machine at (" + machine.xCoord + "GTChunkManager: Chunks forced by the machine at (" + machine.xCoord + ", " + machine.yCoord + ", " @@ -199,6 +199,6 @@ public class GTChunkManager GTLog.out.print("), "); } }); - GTLog.out.println("GT_ChunkManager: End forced chunks dump:"); + GTLog.out.println("GTChunkManager: End forced chunks dump:"); } } diff --git a/src/main/java/gregtech/api/objects/GTRenderedTexture.java b/src/main/java/gregtech/api/objects/GTRenderedTexture.java index a4d0a064ff..abb2e28051 100644 --- a/src/main/java/gregtech/api/objects/GTRenderedTexture.java +++ b/src/main/java/gregtech/api/objects/GTRenderedTexture.java @@ -14,7 +14,7 @@ public class GTRenderedTexture extends gregtech.common.render.GTRenderedTexture public GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) { super(aIcon, aRGBa, aAllowAlpha, false, true, false); - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); + if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTRenderedTexture"); mRGBa = aRGBa; } diff --git a/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java b/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java index d11e176f3d..7b0af48085 100644 --- a/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java +++ b/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java @@ -98,8 +98,8 @@ public class RunnableMachineUpdate implements Runnable { EXECUTOR_SERVICE.shutdownNow(); // Cancel currently executing tasks // Wait a while for tasks to respond to being cancelled if (!EXECUTOR_SERVICE.awaitTermination(60, TimeUnit.SECONDS)) { - GTMod.GT_FML_LOGGER.error( - "Well this didn't terminated well... GT_Runnable_MachineBlockUpdate.shutdownExecutorService"); + GTMod.GT_FML_LOGGER + .error("Well this didn't terminated well... RunnableMachineUpdate.shutdownExecutorService"); } } } catch (InterruptedException ie) { @@ -114,7 +114,7 @@ public class RunnableMachineUpdate implements Runnable { // (Re-)Cancel in case EXECUTOR_SERVICE.shutdownNow(); } finally { - GTMod.GT_FML_LOGGER.info("Leaving... GT_Runnable_MachineBlockUpdate.shutdownExecutorService"); + GTMod.GT_FML_LOGGER.info("Leaving... RunnableMachineUpdate.shutdownExecutorService"); } } diff --git a/src/main/java/gregtech/api/util/GTChunkAssociatedData.java b/src/main/java/gregtech/api/util/GTChunkAssociatedData.java index 7a81c715cb..c87697b80d 100644 --- a/src/main/java/gregtech/api/util/GTChunkAssociatedData.java +++ b/src/main/java/gregtech/api/util/GTChunkAssociatedData.java @@ -114,7 +114,7 @@ public abstract class GTChunkAssociatedData<T extends GTChunkAssociatedData.IDat this.version = version; this.saveDefaults = saveDefaults; if (instances.putIfAbsent(aId, this) != null) - throw new IllegalArgumentException("Duplicate GT_ChunkAssociatedData: " + aId); + throw new IllegalArgumentException("Duplicate GTChunkAssociatedData: " + aId); } private ChunkCoordIntPair getRegionID(int aChunkX, int aChunkZ) { diff --git a/src/main/java/gregtech/api/util/GTModHandler.java b/src/main/java/gregtech/api/util/GTModHandler.java index 23cddf2eb1..af7ddb82ea 100644 --- a/src/main/java/gregtech/api/util/GTModHandler.java +++ b/src/main/java/gregtech/api/util/GTModHandler.java @@ -82,6 +82,8 @@ import ic2.api.reactor.IReactorComponent; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.RecipeOutput; +import ic2.api.recipe.Recipes; +import ic2.core.IC2; import ic2.core.item.ItemToolbox; /** @@ -459,11 +461,11 @@ public class GTModHandler { public static boolean addValuableOre(Block aBlock, int aMeta, int aValue) { if (aValue <= 0) return false; try { - Class.forName("ic2.core.IC2") - .getMethod("addValuableOre", IRecipeInput.class, int.class) - .invoke(null, new RecipeInputItemStack(new ItemStack(aBlock, 1, aMeta)), aValue); - } catch (Throwable e) { - /* Do nothing */ + IC2.addValuableOre(new RecipeInputItemStack(new ItemStack(aBlock, 1, aMeta)), aValue); + } catch (Exception e) { + // TODO remove try catch + // TODO fix : why is bartworks registering items stacks with .getItem() == null + GTLog.err.println("Caught exception when calling IC2.addValuableOre"); } return true; } @@ -476,11 +478,7 @@ public class GTModHandler { if (aOutput == null || aChance <= 0) return false; aOutput.stackSize = 1; if (GTConfig.troll && !GTUtility.areStacksEqual(aOutput, new ItemStack(Items.wooden_hoe, 1, 0))) return false; - try { - ic2.api.recipe.Recipes.scrapboxDrops.addDrop(GTUtility.copyOrNull(aOutput), aChance); - } catch (Throwable e) { - /* Do nothing */ - } + Recipes.scrapboxDrops.addDrop(GTUtility.copyOrNull(aOutput), aChance); return true; } @@ -489,11 +487,7 @@ public class GTModHandler { */ public static boolean addToRecyclerBlackList(ItemStack aRecycledStack) { if (aRecycledStack == null) return false; - try { - ic2.api.recipe.Recipes.recyclerBlacklist.add(new RecipeInputItemStack(aRecycledStack)); - } catch (Throwable e) { - /* Do nothing */ - } + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(aRecycledStack)); return true; } @@ -626,48 +620,23 @@ public class GTModHandler { } public static Map<IRecipeInput, RecipeOutput> getExtractorRecipeList() { - try { - return ic2.api.recipe.Recipes.extractor.getRecipes(); - } catch (Throwable e) { - /* Do nothing */ - } - return emptyRecipeMap; + return Recipes.extractor.getRecipes(); } public static Map<IRecipeInput, RecipeOutput> getCompressorRecipeList() { - try { - return ic2.api.recipe.Recipes.compressor.getRecipes(); - } catch (Throwable e) { - /* Do nothing */ - } - return emptyRecipeMap; + return Recipes.compressor.getRecipes(); } public static Map<IRecipeInput, RecipeOutput> getMaceratorRecipeList() { - try { - return ic2.api.recipe.Recipes.macerator.getRecipes(); - } catch (Throwable e) { - /* Do nothing */ - } - return emptyRecipeMap; + return Recipes.macerator.getRecipes(); } public static Map<IRecipeInput, RecipeOutput> getThermalCentrifugeRecipeList() { - try { - return ic2.api.recipe.Recipes.centrifuge.getRecipes(); - } catch (Throwable e) { - /* Do nothing */ - } - return emptyRecipeMap; + return Recipes.centrifuge.getRecipes(); } public static Map<IRecipeInput, RecipeOutput> getOreWashingRecipeList() { - try { - return ic2.api.recipe.Recipes.oreWashing.getRecipes(); - } catch (Throwable e) { - /* Do nothing */ - } - return emptyRecipeMap; + return Recipes.oreWashing.getRecipes(); } /** @@ -1997,13 +1966,13 @@ public class GTModHandler { private static void generateRecyclerCache() { recyclerWhitelist = new HashSet<>(); - for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerWhitelist) { + for (IRecipeInput input : Recipes.recyclerWhitelist) { for (ItemStack stack : input.getInputs()) { recyclerWhitelist.add(GTUtility.ItemId.create(stack.getItem(), stack.getItemDamage(), null)); } } recyclerBlacklist = new HashSet<>(); - for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerBlacklist) { + for (IRecipeInput input : Recipes.recyclerBlacklist) { for (ItemStack stack : input.getInputs()) { recyclerBlacklist.add(GTUtility.ItemId.create(stack.getItem(), stack.getItemDamage(), null)); } @@ -2022,7 +1991,7 @@ public class GTModHandler { * For the Scrapboxinator */ public static ItemStack getRandomScrapboxDrop() { - return ic2.api.recipe.Recipes.scrapboxDrops.getDrop(ItemList.IC2_Scrapbox.get(1), false); + return Recipes.scrapboxDrops.getDrop(ItemList.IC2_Scrapbox.get(1), false); } /** diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java index 1d44fb9017..777cad836a 100644 --- a/src/main/java/gregtech/asm/GTCorePlugin.java +++ b/src/main/java/gregtech/asm/GTCorePlugin.java @@ -22,11 +22,10 @@ import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; @IFMLLoadingPlugin.MCVersion("1.7.10") @IFMLLoadingPlugin.TransformerExclusions({ "bartworks.ASM", "gtPlusPlus.preloader", "gregtech.asm" }) @IFMLLoadingPlugin.Name("GregTech 5 Unofficial core plugin") -@SuppressWarnings("unused") // loaded by FML public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { - public static final String BWCORE_PLUGIN_NAME = "BartWorks ASM Core Plugin"; public static File minecraftDir; + private static Boolean islwjgl3Present = null; public GTCorePlugin() { // Injection Code taken from CodeChickenLib @@ -76,4 +75,18 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { public List<String> getMixins(Set<String> loadedCoreMods) { return Mixin.getEarlyMixins(loadedCoreMods); } + + public static boolean islwjgl3Present() { + if (islwjgl3Present == null) { + try { + final String className = "org.lwjgl.system.Platform"; + islwjgl3Present = ClassLoader.getSystemClassLoader() + .getResource(className) != null; + } catch (Exception e) { + islwjgl3Present = Boolean.FALSE; + } + } + return islwjgl3Present; + } + } diff --git a/src/main/java/gregtech/common/GTWorldgenerator.java b/src/main/java/gregtech/common/GTWorldgenerator.java index 6762fb868c..a853472089 100644 --- a/src/main/java/gregtech/common/GTWorldgenerator.java +++ b/src/main/java/gregtech/common/GTWorldgenerator.java @@ -71,7 +71,7 @@ public class GTWorldgenerator implements IWorldGenerator { mEndAsteroidProbability = ConfigEndAsteroids.EndAsteroidProbability; GameRegistry.registerWorldGenerator(this, 1073741823); if (debugWorldGen) { - GTLog.out.println("GT_Worldgenerator created"); + GTLog.out.println("GTWorldgenerator created"); } } diff --git a/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java index ab4282c7ba..3ce8823663 100644 --- a/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java +++ b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java @@ -15,7 +15,8 @@ public class GTCopiedBlockTextureRender extends GTTextureBase implements ITextur private final byte mSide, mMeta; protected GTCopiedBlockTextureRender(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedBlockTexture"); + if (aRGBa.length != 4) + throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTCopiedBlockTextureRender"); mBlock = aBlock; mSide = (byte) ordinalSide; mMeta = (byte) aMeta; diff --git a/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java index d3f6292435..a33ead9ec5 100644 --- a/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java +++ b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java @@ -17,7 +17,7 @@ class GTCopiedCTMBlockTexture extends GTTextureBase implements ITexture, IBlockC GTCopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { if (aRGBa.length != 4) - throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedCTMBlockTexture"); + throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTCopiedCTMBlockTexture"); mBlock = aBlock; mSide = (byte) ordinalSide; mMeta = (byte) aMeta; diff --git a/src/main/java/gregtech/common/render/GTRenderedTexture.java b/src/main/java/gregtech/common/render/GTRenderedTexture.java index 3bd4e6d864..b6bffc9553 100644 --- a/src/main/java/gregtech/common/render/GTRenderedTexture.java +++ b/src/main/java/gregtech/common/render/GTRenderedTexture.java @@ -36,7 +36,7 @@ public class GTRenderedTexture extends GTTextureBase implements ITexture, IColor protected GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow, boolean stdOrient, boolean extFacing) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); + if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTRenderedTexture"); mIconContainer = aIcon; mRGBa = aRGBa; this.glow = glow; diff --git a/src/main/java/gregtech/common/render/GTSidedTextureRender.java b/src/main/java/gregtech/common/render/GTSidedTextureRender.java index 15885f10ce..f2f40bff97 100644 --- a/src/main/java/gregtech/common/render/GTSidedTextureRender.java +++ b/src/main/java/gregtech/common/render/GTSidedTextureRender.java @@ -20,7 +20,7 @@ public class GTSidedTextureRender extends GTTextureBase implements ITexture, ICo protected GTSidedTextureRender(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) { - if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); + if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTSidedTextureRender"); mTextures = new ITexture[] { TextureFactory.of(aIcon0, aRGBa, aAllowAlpha), TextureFactory.of(aIcon1, aRGBa, aAllowAlpha), TextureFactory.of(aIcon2, aRGBa, aAllowAlpha), TextureFactory.of(aIcon3, aRGBa, aAllowAlpha), TextureFactory.of(aIcon4, aRGBa, aAllowAlpha), diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java index a89064ba35..bb086dc654 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java @@ -342,7 +342,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { } } } catch (Exception e) { - GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash\n" + e.getMessage()); + GTLog.err.println("MTEWorldAccelerator.onPostTick.crash\n" + e.getMessage()); } } @@ -367,7 +367,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { } } } catch (Exception e) { - GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage()); + GTLog.err.println("MTEWorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage()); } } @@ -464,7 +464,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock { } } } catch (Exception e) { - GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash\n" + e.getMessage()); + GTLog.err.println("MTEWorldAccelerator.tryTickBlock.crash\n" + e.getMessage()); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java index 12153fc10e..74f7d4c655 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java @@ -694,7 +694,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG aNBT.setTag("mLink", link); } } catch (Throwable t) { - GTMod.GT_FML_LOGGER.error("Could not save GT_MetaTileEntity_WormholeGenerator", t); + GTMod.GT_FML_LOGGER.error("Could not save MTEWormholeGenerator", t); } } @@ -742,7 +742,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG Math.min(send_amounts.length, mLink.mSendAmounts.length)); } } catch (Throwable t) { - GTMod.GT_FML_LOGGER.error("Could not load GT_MetaTileEntity_WormholeGenerator", t); + GTMod.GT_FML_LOGGER.error("Could not load MTEWormholeGenerator", t); } } } diff --git a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java index c8fcf5839e..fe0e4b201f 100644 --- a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java @@ -2815,4 +2815,8 @@ public enum GTBeeDefinition implements IBeeDefinition { public final ItemStack getMemberStack(EnumBeeType beeType) { return BeeManager.beeRoot.getMemberStack(getIndividual(), beeType.ordinal()); } + + public GTAlleleBeeSpecies getSpecies() { + return species; + } } diff --git a/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java index 65c150bd1d..ad05b038ed 100644 --- a/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java +++ b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java @@ -32,10 +32,10 @@ public class GTEffectTreeTwister extends GTAlleleEffect { static { if (TF_TRANS_SAPLING == null) { - GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling"); + GTMod.GT_FML_LOGGER.info("GTEffectTreeTwister(): Could not get ItemStack for BarnardaC sapling"); } if (BARN_SAPLING == null) { - GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling"); + GTMod.GT_FML_LOGGER.info("GTEffectTreeTwister(): Could not get ItemStack for BarnardaC sapling"); } } diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index adcd0f33bc..0072a8148c 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -37,6 +37,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsKevlar; import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.Mods; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; @@ -44,6 +45,7 @@ import gregtech.api.fluid.GTFluidFactory; import gregtech.api.items.BlockLongDistancePipe; import gregtech.api.items.GTGenericItem; import gregtech.api.items.ItemBreederCell; +import gregtech.api.items.ItemCoolantCellIC; import gregtech.api.items.ItemRadioactiveCellIC; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; @@ -196,29 +198,28 @@ public class LoaderGTBlockFluid implements Runnable { ItemList.Neutron_Reflector.set(new ItemNeutronReflector("neutronreflector", "Iridium Neutron Reflector", 0)); ItemList.Reactor_Coolant_He_1 - .set(GregTechAPI.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); + .set(new ItemCoolantCellIC("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); ItemList.Reactor_Coolant_He_3 - .set(GregTechAPI.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); + .set(new ItemCoolantCellIC("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); ItemList.Reactor_Coolant_He_6 - .set(GregTechAPI.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); - ItemList.Reactor_Coolant_NaK_1 - .set(GregTechAPI.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); + .set(new ItemCoolantCellIC("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); + ItemList.Reactor_Coolant_NaK_1.set(new ItemCoolantCellIC("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); ItemList.Reactor_Coolant_NaK_3 - .set(GregTechAPI.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); + .set(new ItemCoolantCellIC("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); ItemList.Reactor_Coolant_NaK_6 - .set(GregTechAPI.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); + .set(new ItemCoolantCellIC("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); ItemList.Reactor_Coolant_Sp_1 - .set(GregTechAPI.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); + .set(new ItemCoolantCellIC("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); ItemList.Reactor_Coolant_Sp_2 - .set(GregTechAPI.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); + .set(new ItemCoolantCellIC("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); ItemList.Reactor_Coolant_Sp_3 - .set(GregTechAPI.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); + .set(new ItemCoolantCellIC("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); ItemList.Reactor_Coolant_Sp_6 - .set(GregTechAPI.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); + .set(new ItemCoolantCellIC("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); ItemList.GlowstoneCell.set( new ItemBreederCell( @@ -231,9 +232,8 @@ public class LoaderGTBlockFluid implements Runnable { () -> ItemList.SunnariumCell.get(1))); ItemList.SunnariumCell.set(new ItemDepletedCell("sunnariumCell", "Sunnarium Fuel Rod", 1)); - ItemList.neutroniumHeatCapacitor.set( - GregTechAPI - .constructCoolantCellItem("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000)); + ItemList.neutroniumHeatCapacitor + .set(new ItemCoolantCellIC("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000)); ItemList.Depleted_Thorium_1.set(new ItemDepletedCell("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); ItemList.Depleted_Thorium_2 @@ -1987,14 +1987,9 @@ public class LoaderGTBlockFluid implements Runnable { ItemList.Spray_Empty.get(1L))); if (!GTValues.D1) { - try { - Class.forName("codechicken.nei.api.API"); + if (Mods.NotEnoughItems.isModLoaded()) { GTLog.out.println("GTMod: Hiding certain Items from NEI."); API.hideItem(ItemList.Display_Fluid.getWildcard(1L)); - } catch (Throwable e) { - if (GTValues.D1) { - e.printStackTrace(GTLog.err); - } } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java index 1537aec736..195240958f 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java +++ b/src/main/java/gtPlusPlus/core/block/machine/BlockProjectTable.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.block.machine; -import static gregtech.api.enums.Mods.BuildCraftCore; -import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraft.block.BlockContainer; @@ -27,7 +25,6 @@ import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = Mods.Names.ENDER_I_O) @@ -121,40 +118,17 @@ public class BlockProjectTable extends BlockContainer implements ITileTooltip { if (item.getItem() instanceof ItemToolWrench) { return true; } - if (BuildCraftCore.isModLoaded()) { - return checkBuildcraftWrench(item); + if (Mods.BuildCraftCore.isModLoaded()) { + return item.getItem() instanceof buildcraft.api.tools.IToolWrench; } - if (EnderIO.isModLoaded()) { - return checkEnderIOWrench(item); - } - return false; - } - - private static boolean checkEnderIOWrench(final ItemStack item) { - if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")) { - Class<?> wrenchClass; - wrenchClass = ReflectionUtils.getClass("crazypants.enderio.api.tool.ITool"); - if (wrenchClass.isInstance(item.getItem())) { - return true; - } - } - return false; - } - - private static boolean checkBuildcraftWrench(final ItemStack item) { - if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")) { - Class<?> wrenchClass; - wrenchClass = ReflectionUtils.getClass("buildcraft.api.tools.IToolWrench"); - if (wrenchClass.isInstance(item.getItem())) { - return true; - } + if (Mods.EnderIO.isModLoaded()) { + return item.getItem() instanceof crazypants.enderio.api.tool.ITool; } return false; } @Override - public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, - final int z) { + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return false; } } diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index b358548e15..8de034148b 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -18,6 +18,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.GameRegistry; +import galaxyspace.core.entity.mob.EntityEvolvedColdBlaze; import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; @@ -42,7 +43,6 @@ import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; import gtPlusPlus.xmod.ic2.CustomInternalName; @@ -174,26 +174,27 @@ public class CommonProxy { } // GalaxySpace Support - if (ReflectionUtils.doesClassExist("galaxyspace.core.entity.mob.EntityEvolvedColdBlaze")) { - Class<?> aColdBlaze = ReflectionUtils.getClass("galaxyspace.core.entity.mob.EntityEvolvedColdBlaze"); - ItemStack aSmallBlizz, aTinyBlizz, aSmallCryo, aTinyCryo; - aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1); - aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1); - aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1); - aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1); - EntityUtils - .registerDropsForMob(aColdBlaze, ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), 2, 500); + if (Mods.GalaxySpace.isModLoaded()) { + ItemStack aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1); + ItemStack aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1); + ItemStack aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1); + ItemStack aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1); + EntityUtils.registerDropsForMob( + EntityEvolvedColdBlaze.class, + ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), + 2, + 500); if (aSmallBlizz != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aSmallBlizz, 2, 750); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aSmallBlizz, 2, 750); } if (aTinyBlizz != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aTinyBlizz, 4, 1500); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aTinyBlizz, 4, 1500); } if (aSmallCryo != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aSmallCryo, 1, 50); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aSmallCryo, 1, 50); } if (aTinyCryo != null) { - EntityUtils.registerDropsForMob(aColdBlaze, aTinyCryo, 2, 100); + EntityUtils.registerDropsForMob(EntityEvolvedColdBlaze.class, aTinyCryo, 2, 100); } } } diff --git a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java index 87c5ab3e74..c245d78c9d 100644 --- a/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java +++ b/src/main/java/gtPlusPlus/core/item/general/books/ItemBaseBook.java @@ -1,15 +1,9 @@ package gtPlusPlus.core.item.general.books; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gtPlusPlus.core.handler.BookHandler.mBookMap; -import static gtPlusPlus.core.util.Utils.addBookTitleLocalization; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiScreenBook; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -21,18 +15,18 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.Mods; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.handler.BookHandler; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class ItemBaseBook extends ItemWritableBook { public ItemBaseBook() { this.setCreativeTab(AddToCreativeTab.tabMisc); this.setMaxStackSize(1); - this.setTextureName(GTPlusPlus.ID + ":" + "itemBook"); + this.setTextureName(Mods.GTPlusPlus.ID + ":" + "itemBook"); this.setUnlocalizedName("itembookgt"); GameRegistry.registerItem(this, "bookGT"); } @@ -56,9 +50,9 @@ public class ItemBaseBook extends ItemWritableBook { public String getItemStackDisplayName(final ItemStack tItem) { if (NBTUtils.hasKey(tItem, "title")) { return NBTUtils.getString(tItem, "title"); - } else if (tItem.getItemDamage() > -1 && tItem.getItemDamage() <= mBookMap.size()) { - return EnumChatFormatting.ITALIC + "" - + addBookTitleLocalization(mBookMap.get(tItem.getItemDamage()).mTitle); + } else if (tItem.getItemDamage() > -1 && tItem.getItemDamage() <= BookHandler.mBookMap.size()) { + return EnumChatFormatting.ITALIC + + Utils.addBookTitleLocalization(BookHandler.mBookMap.get(tItem.getItemDamage()).mTitle); } // NBTUtils.tryIterateNBTData(tItem); return "GT++ Storybook"; @@ -69,13 +63,14 @@ public class ItemBaseBook extends ItemWritableBook { // TODO Auto-generated method stub if (NBTUtils.hasKey(tItem, "author")) { list.add(EnumChatFormatting.GRAY + "Author: " + NBTUtils.getString(tItem, "author")); - } else if (mBookMap.get(tItem.getItemDamage()).mAuthor != null) { - list.add(EnumChatFormatting.WHITE + "Author: " + mBookMap.get(tItem.getItemDamage()).mAuthor); + } else if (BookHandler.mBookMap.get(tItem.getItemDamage()).mAuthor != null) { + list.add(EnumChatFormatting.WHITE + "Author: " + BookHandler.mBookMap.get(tItem.getItemDamage()).mAuthor); } if (NBTUtils.hasKey(tItem, "title")) { list.add(EnumChatFormatting.GRAY + "Pages: " + NBTUtils.getString(tItem, "pages")); - } else if (mBookMap.get(tItem.getItemDamage()).mPages != null) { - list.add(EnumChatFormatting.WHITE + "Pages: " + mBookMap.get(tItem.getItemDamage()).mPages.length); + } else if (BookHandler.mBookMap.get(tItem.getItemDamage()).mPages != null) { + list.add( + EnumChatFormatting.WHITE + "Pages: " + BookHandler.mBookMap.get(tItem.getItemDamage()).mPages.length); } // super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_); } @@ -90,32 +85,22 @@ public class ItemBaseBook extends ItemWritableBook { return false; } - @Override @SideOnly(Side.CLIENT) + @Override public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) { - // player.displayGUIBook(item); - int i = item.getItemDamage(); - ItemStack bookstack = Utils.getWrittenBook( - null, - mBookMap.get(i).mMeta, - mBookMap.get(i).mMapping, - mBookMap.get(i).mTitle, - mBookMap.get(i).mAuthor, - mBookMap.get(i).mPages); - if (player.worldObj.isRemote) { - try { - Class<?> clazz = ReflectionUtils.getClass("net.minecraft.client.gui.GuiScreenBook"); - Constructor<?> ctor = clazz.getConstructor(EntityPlayer.class, ItemStack.class, boolean.class); - Object object = ctor.newInstance(new Object[] { player, bookstack, false }); + int i = item.getItemDamage(); + ItemStack bookstack = Utils.getWrittenBook( + null, + BookHandler.mBookMap.get(i).mMeta, + BookHandler.mBookMap.get(i).mMapping, + BookHandler.mBookMap.get(i).mTitle, + BookHandler.mBookMap.get(i).mAuthor, + BookHandler.mBookMap.get(i).mPages); + if (bookstack != null) { Minecraft.getMinecraft() - .displayGuiScreen((GuiScreen) object); - } catch (InstantiationException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | NoSuchMethodException | SecurityException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + .displayGuiScreen(new GuiScreenBook(player, bookstack, false)); } - // Minecraft.getMinecraft().displayGuiScreen(new GuiScreenBook(player, bookstack, false)); } return item; } diff --git a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java index 985e942f52..c78d734cb6 100644 --- a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java +++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java @@ -36,7 +36,7 @@ public class GTPPCore { public static final float PI = (float) Math.PI; public static volatile Random RANDOM = new XSTR(); - public static boolean DEVENV = false;; + public static boolean DEVENV = false; // Mod Variables public static final String name = "GT++"; diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 5e29ddb53e..7ea6af4a23 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -75,63 +75,25 @@ public class PlayerUtils { } public static boolean isPlayerOP(final EntityPlayer player) { - if (player.canCommandSenderUseCommand(2, "")) { - return true; - } - return false; + return player.canCommandSenderUseCommand(2, ""); } // Not Clientside public static ItemStack getItemStackInPlayersHand(final World world, final String Name) { - final EntityPlayer thePlayer = getPlayer(Name); - ItemStack heldItem = null; - try { - heldItem = thePlayer.getHeldItem(); - } catch (final NullPointerException e) { - return null; - } - if (heldItem != null) { - return heldItem; - } - return null; + return PlayerUtils.getItemStackInPlayersHand(getPlayer(Name)); } @SideOnly(Side.CLIENT) public static ItemStack getItemStackInPlayersHand() { - final Minecraft mc = Minecraft.getMinecraft(); - ItemStack heldItem; - try { - heldItem = mc.thePlayer.getHeldItem(); - } catch (final NullPointerException e) { - return null; - } - if (heldItem != null) { - return heldItem; - } - return null; + return PlayerUtils.getItemStackInPlayersHand(Minecraft.getMinecraft().thePlayer); } public static ItemStack getItemStackInPlayersHand(final EntityPlayer player) { - ItemStack heldItem; - try { - heldItem = player.getHeldItem(); - } catch (final NullPointerException e) { - e.printStackTrace(); - return null; - } - if (heldItem != null) { - return heldItem; - } else { - if (Utils.isClient()) { - heldItem = player.getItemInUse(); - } else { - heldItem = player.getCurrentEquippedItem(); - } - } - return heldItem; + if (player == null) return null; + return player.getHeldItem(); } - public static final UUID getPlayersUUIDByName(final String aPlayerName) { + public static UUID getPlayersUUIDByName(final String aPlayerName) { final EntityPlayer player = PlayerUtils.getPlayer(aPlayerName); if (player != null) { return player.getUniqueID(); @@ -157,7 +119,7 @@ public class PlayerUtils { if (aPlayer instanceof FakePlayer || (mThaumcraftFakePlayer != null && mThaumcraftFakePlayer.isInstance(aPlayer)) || (aPlayer.getCommandSenderName() == null || aPlayer.getCommandSenderName() - .length() <= 0) + .isEmpty()) || (aPlayer.isEntityInvulnerable() && !aPlayer.canCommandSenderUseCommand(0, "") && (aChunkLocation == null) || (aChunkLocation.posX == 0 && aChunkLocation.posY == 0 && aChunkLocation.posZ == 0))) { mCachedFakePlayers.put( @@ -187,7 +149,7 @@ public class PlayerUtils { return false; } if (p.getCommandSenderName() - .length() <= 0) { + .isEmpty()) { cacheFakePlayer(p); return false; } @@ -196,11 +158,9 @@ public class PlayerUtils { cacheFakePlayer(p); return false; } - if (!isCachedFakePlayer( + return !isCachedFakePlayer( p.getUniqueID() - .toString())) { - return true; - } + .toString()); } return false; } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index d7f0815368..50a7cd547a 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -296,9 +296,9 @@ public class WorldGen_GT_Base implements IWorldGenerator { + (WorldGen_GT_Ore_Layer.sWeight > 0)); Logger.INFO( "[World Generation Debug] WorldGen_GT_Ore_Layer.sList.size() > 0? " - + (WorldGen_GT_Ore_Layer.sList.size() > 0)); + + (!WorldGen_GT_Ore_Layer.sList.isEmpty())); if ((oreveinPercentageRoll < oreveinPercentage) && (WorldGen_GT_Ore_Layer.sWeight > 0) - && (WorldGen_GT_Ore_Layer.sList.size() > 0)) { + && (!WorldGen_GT_Ore_Layer.sList.isEmpty())) { int placementAttempts = 0; boolean oreveinFound = false; int i; diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 06372740e4..dc033514f1 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -8,7 +8,7 @@ import net.minecraft.launchwrapper.IClassTransformer; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import gtPlusPlus.core.util.reflect.ReflectionUtils; +import gregtech.asm.GTCorePlugin; import gtPlusPlus.preloader.PreloaderCore; import gtPlusPlus.preloader.PreloaderLogger; import gtPlusPlus.preloader.asm.AsmConfig; @@ -48,9 +48,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix LWJGL index array out of bounds on keybinding IDs if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS)) && AsmConfig.enabledLwjglKeybindingFix - // Do not transform if using lwjgl3 - && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) { - boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard"); + && !GTCorePlugin.islwjgl3Present()) { + boolean isClientSettingsClass = !transformedName.equals(LWJGL_KEYBOARD); PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName); return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter() .toByteArray(); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java index 7f7553bf1d..6b9c5ae8f2 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java @@ -1,13 +1,11 @@ package gtPlusPlus.xmod.forestry.bees.custom; -import java.lang.reflect.Field; import java.util.Arrays; import java.util.Locale; import net.minecraft.item.ItemStack; import net.minecraftforge.common.BiomeDictionary.Type; -import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.text.WordUtils; import forestry.api.apiculture.BeeManager; @@ -28,14 +26,14 @@ import forestry.apiculture.genetics.BeeVariation; import forestry.apiculture.genetics.IBeeDefinition; import forestry.core.genetics.alleles.AlleleHelper; import gregtech.loaders.misc.GTBeeDefinition; +import gregtech.loaders.misc.GTBranchDefinition; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public enum GTPPBeeDefinition implements IBeeDefinition { - SILICON(GTPPBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), + SILICON(GTBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125)) { @Override @@ -54,13 +52,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("SLIMEBALL"), - getGregtechBeeType("STICKYRESIN"), + GTBeeDefinition.SLIMEBALL.getSpecies(), + GTBeeDefinition.STICKYRESIN.getSpecies(), 10); } }, - RUBBER(GTPPBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), + RUBBER(GTBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75)) { @Override @@ -79,13 +77,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("SLIMEBALL"), - getGregtechBeeType("STICKYRESIN"), + GTBeeDefinition.SLIMEBALL.getSpecies(), + GTBeeDefinition.STICKYRESIN.getSpecies(), 10); } }, - PLASTIC(GTPPBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), + PLASTIC(GTBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175)) { @Override @@ -103,11 +101,14 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(RUBBER.species, getGregtechBeeType("OIL"), 10); + IBeeMutationCustom tMutation = registerMutation( + GTPPBeeDefinition.RUBBER.species, + GTBeeDefinition.OIL.getSpecies(), + 10); } }, - PTFE(GTPPBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), + PTFE(GTBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150), Utils.rgbtoHexValue(75, 75, 75)) { @Override @@ -129,7 +130,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } }, - PBS(GTPPBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) { + PBS(GTBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { @@ -153,7 +154,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { /** * Fuels */ - BIOMASS(GTPPBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), + BIOMASS(GTBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24), Utils.rgbtoHexValue(23, 175, 14)) { @Override @@ -176,7 +177,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } }, - ETHANOL(GTPPBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), + ETHANOL(GTBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0), Utils.rgbtoHexValue(220, 156, 32)) { @Override @@ -202,7 +203,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { /** * Materials */ - FLUORINE(GTPPBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), + FLUORINE(GTBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230), Utils.rgbtoHexValue(10, 150, 150)) { @Override @@ -221,8 +222,8 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("LAPIS"), - getGregtechBeeType("SAPPHIRE"), + GTBeeDefinition.LAPIS.getSpecies(), + GTBeeDefinition.SAPPHIRE.getSpecies(), 5); tMutation.restrictBiomeType(Type.COLD); } @@ -231,7 +232,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition { // Coke // Force - FORCE(GTPPBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), + FORCE(GTBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)) { @Override @@ -252,15 +253,15 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("STEEL"), - getGregtechBeeType("GOLD"), + GTBeeDefinition.STEEL.getSpecies(), + GTBeeDefinition.GOLD.getSpecies(), 10); tMutation.restrictBiomeType(Type.HOT); } }, // Nikolite - NIKOLITE(GTPPBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), + NIKOLITE(GTBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200), Utils.rgbtoHexValue(40, 150, 170)) { @Override @@ -279,8 +280,8 @@ public enum GTPPBeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation( - getGregtechBeeType("ALUMINIUM"), - getGregtechBeeType("SILVER"), + GTBeeDefinition.ALUMINIUM.getSpecies(), + GTBeeDefinition.SILVER.getSpecies(), 8); tMutation.restrictBiomeType(Type.HOT); } @@ -476,13 +477,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition { ; - private final GTPPBranchDefinition branch; + private final GTBranchDefinition branch; private final IAlleleBeeSpeciesCustom species; private IAllele[] template; private IBeeGenome genome; - GTPPBeeDefinition(GTPPBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) { + GTPPBeeDefinition(GTBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) { String lowercaseName = this.toString() .toLowerCase(Locale.ENGLISH); String species = "species" + WordUtils.capitalize(lowercaseName); @@ -587,18 +588,4 @@ public enum GTPPBeeDefinition implements IBeeDefinition { } return result; } - - public static IAlleleBeeSpecies getGregtechBeeType(String name) { - try { - Enum<GTBeeDefinition> gtBeeEnumObject = Enum.valueOf(GTBeeDefinition.class, name); - Field gtBeesField = FieldUtils.getDeclaredField(GTBeeDefinition.class, "species", true); - gtBeesField.setAccessible(true); - ReflectionUtils.makeFieldAccessible(gtBeesField); - Object beeType = gtBeesField.get(gtBeeEnumObject); - return (IAlleleBeeSpecies) beeType; - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return null; - } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java index f0cd284bdf..583e66d2c6 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java @@ -5,19 +5,14 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeBuilder.TICKS; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.reflect.FieldUtils; - -import gregtech.GTMod; import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; +import gregtech.common.items.CombType; +import gregtech.loaders.misc.GTBees; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld; import gtPlusPlus.core.item.base.misc.BaseItemMisc; @@ -25,7 +20,6 @@ import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class GTPPBees { @@ -39,11 +33,9 @@ public class GTPPBees { // Base Comb Item public static ItemCustomComb combs; - // Combs obtained via reflection public static ItemStack Comb_Slag; public static ItemStack Comb_Stone; - // Materials obtained via reflection public static Materials PTFE; public static Materials PBS; @@ -52,7 +44,6 @@ public class GTPPBees { public GTPPBees() { if (Forestry.isModLoaded()) { - // Set Materials and Comb stacks from GT via Reflection setMaterials(); setCustomItems(); @@ -99,67 +90,19 @@ public class GTPPBees { .addTo(fluidExtractionRecipes); } - private static boolean tryGetBeesBoolean() { - try { - Class<?> mProxy = Class.forName("gregtech.GTMod.gregtechproxy"); - Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true); - boolean returnValue = (boolean) mNerf.get(GTMod.gregtechproxy); - return returnValue; - } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) { - return false; - } - } - private void setMaterials() { - try { - - Class<?> gtBees = Class.forName("gregtech.loaders.misc.GTBees"); - Class<?> gtCombItemClass = Class.forName("gregtech.common.items.ItemComb"); - Class gtCombEnumClass = Class.forName("gregtech.common.items.CombType"); - Field gtCombs = FieldUtils.getDeclaredField(gtBees, "combs", true); - gtCombs.setAccessible(true); - ReflectionUtils.makeFieldAccessible(gtCombs); - Enum gtCombTypeSlag = Enum.valueOf(gtCombEnumClass, "SLAG"); - Enum gtCombTypeStone = Enum.valueOf(gtCombEnumClass, "STONE"); - Object oCombObject = gtCombs.get(null); - - Logger.DEBUG_BEES("Field getModifiers: " + gtCombs.getModifiers()); - Logger.DEBUG_BEES("Field toGenericString: " + gtCombs.toGenericString()); - Logger.DEBUG_BEES("Field getClass: " + gtCombs.getClass()); - Logger.DEBUG_BEES("Field isEnumConstant: " + gtCombs.isEnumConstant()); - Logger.DEBUG_BEES("Field isSynthetic: " + gtCombs.isSynthetic()); - Logger.DEBUG_BEES("Field get(gtBees) != null: " + (gtCombs.get(gtBees) != null)); - Logger.DEBUG_BEES("Field isAccessible: " + gtCombs.isAccessible()); - - Logger.BEES("gtBees: " + (gtBees != null)); - Logger.BEES("gtCombItemClass: " + (gtCombItemClass != null)); - Logger.BEES("gtCombEnumClass: " + (gtCombEnumClass != null)); - Logger.BEES("gtCombs: " + (gtCombs != null)); - Logger.BEES("gtCombTypeSlag: " + (gtCombTypeSlag != null)); - Logger.BEES("gtCombTypeStone: " + (gtCombTypeStone != null)); - Logger.BEES("oCombObject: " + (oCombObject != null)); - - // if (gtCombItemClass.isInstance(oCombObject)){ - Method getStackForType; - getStackForType = gtCombItemClass.getDeclaredMethod("getStackForType", gtCombEnumClass); - - if (getStackForType != null) { - Logger.BEES("Found Method: getStackForType"); - } - if (Comb_Slag == null) { - Comb_Slag = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeSlag); - } - if (Comb_Stone == null) { - Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone); - } - - } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException - | NoSuchMethodException | SecurityException | InvocationTargetException e) { - Logger.BEES("Bad Reflection. setMaterials()"); + if (Comb_Slag == null) { + Comb_Slag = GTBees.combs.getStackForType(CombType.SLAG); + } + if (Comb_Stone == null) { + Comb_Stone = GTBees.combs.getStackForType(CombType.STONE); + } + if (PTFE == null) { + PTFE = trySetValue("Polytetrafluoroethylene"); + } + if (PBS == null) { + PBS = trySetValue("StyreneButadieneRubber"); } - - PTFE = trySetValue("Polytetrafluoroethylene"); - PBS = trySetValue("StyreneButadieneRubber"); } private Materials trySetValue(String material) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java deleted file mode 100644 index ca35849172..0000000000 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java +++ /dev/null @@ -1,76 +0,0 @@ -package gtPlusPlus.xmod.forestry.bees.custom; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IClassification; -import gtPlusPlus.api.objects.Logger; - -public enum GTPPBranchDefinition { - - ORGANIC("ORGANIC"), - GEM("GEM"), - METAL("METAL"), - RAREMETAL("RAREMETAL"), - RADIOACTIVE("RADIOACTIVE"); - - final String mFieldName; - final Enum mActualValues; - - GTPPBranchDefinition(String mValue) { - this.mFieldName = mValue; - this.mActualValues = setEnumVar(mValue); - } - - public final IAllele[] getTemplate() { - Class gtBranchDefClass; - try { - gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); - Enum enumA = mActualValues; - Method methodMyMethod = gtBranchDefClass.getMethod("getTemplate"); - - Logger.INFO("[Bees] gtBranchDefClass: " + (gtBranchDefClass != null)); - Logger.INFO("[Bees] enumA: " + (enumA != null)); - Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null)); - - return (IAllele[]) methodMyMethod.invoke(enumA); - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - Logger.INFO("[Bees] Bad Reflection. getTemplate()"); - e.printStackTrace(); - // gregtech.loaders.misc.GT_BranchDefinition.getTemplate() - return null; - } - } - - public final IClassification getBranch() { - Class gtBranchDefClass; - try { - gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); - Enum enum_MY_SAMPLE_ENUM = mActualValues; - Method methodMyMethod = gtBranchDefClass.getMethod("getBranch"); - - Logger.INFO("[Bees] gtBranchDefClass: " + (gtBranchDefClass != null)); - Logger.INFO("[Bees] enum_MY_SAMPLE_ENUM: " + (enum_MY_SAMPLE_ENUM != null)); - Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null)); - - return (IClassification) methodMyMethod.invoke(enum_MY_SAMPLE_ENUM); - } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException - | IllegalArgumentException | InvocationTargetException e) { - Logger.INFO("[Bees] Bad Reflection. getBranch()"); - e.printStackTrace(); - return null; - } - } - - private Enum setEnumVar(String value) { - try { - Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition"); - Enum branchDef = Enum.valueOf(gtBranchDefClass, value); - return branchDef; - } catch (ClassNotFoundException e) { - return null; - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java index dad53f54f6..738afb0d90 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java @@ -634,10 +634,10 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas // Handle Custom Hatches if (aMetaTileEntity instanceof MTEHatchInputBattery) { - log("Found GT_MetaTileEntity_Hatch_InputBattery"); + log("Found MTEHatchInputBattery"); aDidAdd = addToMachineListInternal(mChargeHatches, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof MTEHatchOutputBattery) { - log("Found GT_MetaTileEntity_Hatch_OutputBattery"); + log("Found MTEHatchOutputBattery"); aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex); } else if (aMetaTileEntity instanceof METHatchAirIntake) { aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex) @@ -1020,7 +1020,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas if (tCurrentItem != null) { // Logger.INFO("Holding Item."); if (tCurrentItem.getItem() instanceof MetaGeneratedTool) { - // Logger.INFO("Is GT_MetaGenerated_Tool."); + // Logger.INFO("Is MetaGeneratedTool."); int[] aOreID = OreDictionary.getOreIDs(tCurrentItem); for (int id : aOreID) { // Plunger diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java index d1a6ac34f0..063b5747b9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java @@ -201,7 +201,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi return false; } if (aMetaTileEntity instanceof MTEHatchMillingBalls) { - log("Found GT_MetaTileEntity_Hatch_MillingBalls"); + log("Found MTEHatchMillingBalls"); return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex); } return super.addToMachineList(aTileEntity, aBaseCasingIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java index 2046de6c1c..5de235982f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java @@ -508,7 +508,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple return false; } if (aMetaTileEntity instanceof MTEHatchCatalysts) { - log("Found GT_MetaTileEntity_Hatch_Catalysts"); + log("Found MTEHatchCatalysts"); return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex); } return super.addToMachineList(aTileEntity, aBaseCasingIndex); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java index 69e3580f11..0bd1397137 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java @@ -267,7 +267,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT return false; } if (aMetaTileEntity instanceof MTEHatchTurbine aTurbineHatch) { - log("Found GT_MetaTileEntity_Hatch_Turbine"); + log("Found MTEHatchTurbine"); updateTexture(aTileEntity, aBaseCasingIndex); IGregTechTileEntity g = this.getBaseMetaTileEntity(); if (aTurbineHatch.setController(new BlockPos(g.getXCoord(), g.getYCoord(), g.getZCoord(), g.getWorld()))) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index f08457f807..9f66dc394f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -700,8 +700,8 @@ public class GregtechConduits { OrePrefixes.pipeMedium.get(material), new MTEFluid( startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", + "GT_Pipe_" + material.mDefaultLocalName, + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 12, @@ -761,8 +761,8 @@ public class GregtechConduits { OrePrefixes.pipeMedium.get(material), new GTPPMTEFluid( startID + 2, - "GT_Pipe_" + material.mDefaultLocalName + "", - "" + material.mDefaultLocalName + " Fluid Pipe", + "GT_Pipe_" + material.mDefaultLocalName, + material.mDefaultLocalName + " Fluid Pipe", 0.5F, material, transferRatePerTick * 12, diff --git a/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java b/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java index 92b4312e25..58ae605d8c 100644 --- a/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java +++ b/src/main/java/gtneioreplugin/util/GT5OreSmallHelper.java @@ -46,7 +46,6 @@ public class GT5OreSmallHelper { } public static void init() { - checkExtraSupport(); ItemStack stack; Materials material; short meta; @@ -143,19 +142,6 @@ public class GT5OreSmallHelper { // --- End of handling for dimToOreWrapper --- } - private static void checkExtraSupport() { - Class<?> clazzGTOreSmall = null; - try { - clazzGTOreSmall = Class.forName("gregtech.common" + ".GT_Worldgen_GT_Ore_SmallPieces"); - } catch (ClassNotFoundException ignored) {} - if (clazzGTOreSmall != null) { - try { - clazzGTOreSmall.getField("mRestrictBiome"); - restrictBiomeSupport = true; - } catch (Exception ignored) {} - } - } - public static Materials[] getDroppedDusts() { return new Materials[] { Materials.Stone, Materials.Netherrack, Materials.Endstone, Materials.GraniteBlack, Materials.GraniteRed, Materials.Marble, Materials.Basalt, Materials.Stone }; diff --git a/src/main/java/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/tectech/loader/recipe/BaseRecipeLoader.java index 91e8f01ae6..8b6c40c6f8 100644 --- a/src/main/java/tectech/loader/recipe/BaseRecipeLoader.java +++ b/src/main/java/tectech/loader/recipe/BaseRecipeLoader.java @@ -30,7 +30,7 @@ public class BaseRecipeLoader { public static Materials getOrDefault(String name, Materials def) { Materials mat = Materials.get(name); - return mat == Materials._NULL || mat == null ? def : mat; + return mat == Materials._NULL ? def : mat; } public void run() { |