aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_Proxy.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/GT_Proxy.java')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java180
1 files changed, 44 insertions, 136 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 03257cd59b..d21491adea 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -9,6 +9,7 @@ import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.genetics.AlleleManager;
+import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
import gregtech.api.enums.TC_Aspects.TC_AspectStack;
@@ -21,11 +22,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.GT_MetaGenerated_Item;
import gregtech.api.items.GT_MetaGenerated_Tool;
import gregtech.api.net.GT_Packet_Pollution;
-import gregtech.api.objects.GT_Fluid;
-import gregtech.api.objects.GT_FluidStack;
-import gregtech.api.objects.GT_UO_DimensionList;
-import gregtech.api.objects.ItemData;
-import gregtech.api.objects.GT_ChunkManager;
+import gregtech.api.objects.*;
import gregtech.api.util.*;
import gregtech.common.entities.GT_Entity_Arrow;
import gregtech.common.gui.GT_ContainerVolumetricFlask;
@@ -81,14 +78,11 @@ import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import org.apache.commons.lang3.text.WordUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.text.DateFormat;
import java.util.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import static gregtech.api.enums.GT_Values.debugEntityCramming;
@@ -226,19 +220,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean ic2EnergySourceCompat = true;
public boolean costlyCableConnection = false;
- //CLS
- private static Field isNice;
-
- private static Class alexiilMinecraftDisplayer;
- private static Field isRegisteringGTmaterials;
- //private static Method getLastPercent;
-
- private static Class alexiilProgressDisplayer;
- private static Method displayProgress;
-
-
- //end CLS
-
public GT_Proxy() {
GameRegistry.registerFuelHandler(this);
MinecraftForge.EVENT_BUS.register(this);
@@ -257,45 +238,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
}
}
} catch (Throwable e) {e.printStackTrace(GT_Log.err);}
-
- //CLS
- System.out.println("Uing reflection on CLS");
- try {
- alexiilMinecraftDisplayer = Class.forName("alexiil.mods.load.MinecraftDisplayer");
- } catch (Throwable e) { System.out.println("bruh momento1"); e.printStackTrace(GT_Log.err); }
- try {
- isRegisteringGTmaterials = alexiilMinecraftDisplayer.getField("isRegisteringGTmaterials");
- } catch (Throwable e) {System.out.println("bruh momento2");e.printStackTrace(GT_Log.err);}
- try {
- isNice = alexiilMinecraftDisplayer.getField("isNice");
- } catch (Throwable e) {System.out.println("bruh momento3");e.printStackTrace(GT_Log.err);}
-
- try {
- alexiilProgressDisplayer = Class.forName("alexiil.mods.load.ProgressDisplayer");
- } catch (Throwable e) {System.out.println("bruh momento4");e.printStackTrace(GT_Log.err);}
- try {
- //hmm errors here
- displayProgress = alexiilProgressDisplayer.getDeclaredMethod("displayProgress", String.class, float.class);
- } catch (Throwable e) {System.out.println("bruh momento5");e.printStackTrace(GT_Log.err);}
- //end CLS
}
- private static final void registerRecipes(OreDictEventContainer aOre) {
- if ((aOre.mEvent.Ore == null) || (aOre.mEvent.Ore.getItem() == null)) {
- return;
- }
- if (aOre.mEvent.Ore.stackSize != 1) {
- aOre.mEvent.Ore.stackSize = 1;
- }
- if (aOre.mPrefix != null) {
- if (!aOre.mPrefix.isIgnored(aOre.mMaterial)) {
- aOre.mPrefix.processOre(aOre.mMaterial == null ? Materials._NULL : aOre.mMaterial, aOre.mEvent.Name, aOre.mModID,
- GT_Utility.copyAmount(1L, aOre.mEvent.Ore));
- }
- } else {
-// GT_FML_LOGGER.info("Thingy Name: "+ aOre.mEvent.Name+ " !!!Unknown 'Thingy' detected!!! This Object seems to probably not follow a valid OreDictionary Convention, or I missed a Convention. Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
- }
- }
public void onPreLoad() {
GT_Log.out.println("GT_Mod: Preload-Phase started!");
@@ -1257,6 +1201,23 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
e.printStackTrace(GT_Log.err);
}
}
+
+ public static void stepMaterialsVanilla(Collection<GT_Proxy.OreDictEventContainer> mEvents, ProgressManager.ProgressBar progressBar){
+ int size = 5;
+ int sizeStep = mEvents.size() / 20 - 1;
+ GT_Proxy.OreDictEventContainer tEvent;
+ for (Iterator<GT_Proxy.OreDictEventContainer> i$ = mEvents.iterator(); i$.hasNext(); GT_Proxy.registerRecipes(tEvent)) {
+ tEvent = i$.next();
+ sizeStep--;
+ if(sizeStep == 0) {
+ GT_Mod.GT_FML_LOGGER.info("Baking : " + size + "%", new Object[0]);
+ sizeStep = mEvents.size()/20-1;
+ size += 5;
+ }
+ progressBar.step(tEvent.mMaterial == null ? "" : tEvent.mMaterial.toString());
+ }
+ ProgressManager.pop(progressBar);
+ }
@SubscribeEvent
public void onLivingUpdate(LivingUpdateEvent aEvent) {
@@ -1353,6 +1314,22 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
}
}
+ public static void registerRecipes(GT_Proxy.OreDictEventContainer aOre) {
+ if ((aOre.mEvent.Ore == null) || (aOre.mEvent.Ore.getItem() == null)) {
+ return;
+ }
+ if (aOre.mEvent.Ore.stackSize != 1) {
+ aOre.mEvent.Ore.stackSize = 1;
+ }
+ if (aOre.mPrefix != null) {
+ if (!aOre.mPrefix.isIgnored(aOre.mMaterial)) {
+ aOre.mPrefix.processOre(aOre.mMaterial == null ? Materials._NULL : aOre.mMaterial, aOre.mEvent.Name, aOre.mModID, GT_Utility.copyAmount(1L, aOre.mEvent.Ore));
+ }
+ } else {
+// GT_FML_LOGGER.info("Thingy Name: "+ aOre.mEvent.Name+ " !!!Unknown 'Thingy' detected!!! This Object seems to probably not follow a valid OreDictionary Convention, or I missed a Convention. Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
+ }
+ }
+
@SubscribeEvent
public void onPlayerTickEventServer(TickEvent.PlayerTickEvent aEvent) {
if ((aEvent.side.isServer()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) {
@@ -1962,89 +1939,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
GT_Recipe.reInit();
}
+ @SuppressWarnings("deprecation")
public void activateOreDictHandler() {
- final Logger GT_FML_LOGGER = LogManager.getLogger("GregTech GTNH");
-
this.mOreDictActivated = true;
ProgressManager.ProgressBar progressBar = ProgressManager.push("Register materials", mEvents.size());
- int sizeStep = mEvents.size()/20-1;
- int size = 5;
- //CLS
- boolean hasSetNice = false;
- if (Loader.isModLoaded("betterloadingscreen")) {
- //isRegisteringGTmaterials.setAccessible(true);
- //isNice.setAccessible(true);
- //displayProgress.setAccessible(true);
- try {
- //alexiil.mods.load.MinecraftDisplayer.isRegisteringGTmaterials = true;
- isRegisteringGTmaterials.set(null, true);
- } catch (Throwable e) {
- e.printStackTrace();
- }
- sizeStep = mEvents.size()/100-1;
- size = 0;
- hasSetNice = false;
- }
- //end CLS
- OreDictEventContainer tEvent;
-
- for (Iterator i$ = this.mEvents.iterator(); i$.hasNext(); registerRecipes(tEvent)) {
- tEvent = (OreDictEventContainer) i$.next();
- sizeStep--;
- //CLS
- if (Loader.isModLoaded("betterloadingscreen")) {
- if (!(tEvent.mMaterial == null)) {
- try {
- //alexiil.mods.load.ProgressDisplayer.displayProgress(tEvent.mMaterial.toString(), ((float)size)/100);
- displayProgress.invoke(null, tEvent.mMaterial.toString(), ((float)size)/100);
- } catch (Throwable e) {
- e.printStackTrace();
- }
- if (size == 70 && !hasSetNice) {
- hasSetNice = true;
- try {
- //alexiil.mods.load.MinecraftDisplayer.isNice = true;
- isNice.set(null, true);
- } catch (Throwable e) {
- e.printStackTrace();
- }
- GT_FML_LOGGER.info("nice");
- } else if (size != 70) {
- try{
- //alexiil.mods.load.MinecraftDisplayer.isNice = false;
- isNice.set(null, false);
- } catch (Throwable e) {
- e.printStackTrace();
- }
- }
- }
- }
- //end CLS
- if( sizeStep == 0 ) {
- GT_FML_LOGGER.info("Baking : " + size + "%", new Object[0]);
- //CLS
- if (Loader.isModLoaded("betterloadingscreen")) {
- sizeStep = mEvents.size()/100-1;
- size++;
- } else {
- //end CLS
- sizeStep = mEvents.size()/20-1;
- size += 5;
- }
- }
- progressBar.step(tEvent.mMaterial == null ? "" : tEvent.mMaterial.toString());
- }
- ProgressManager.pop(progressBar);
- //CLS
- if (Loader.isModLoaded("betterloadingscreen")) {
+ if (Loader.isModLoaded("betterloadingscreen")){
+ GT_Values.cls_enabled = true;
try {
- //alexiil.mods.load.MinecraftDisplayer.isRegisteringGTmaterials = false;
- isRegisteringGTmaterials.set(null, false);
- } catch (Throwable e) {
- e.printStackTrace();
+ GT_CLS_Compat.stepMaterialsCLS(mEvents, progressBar);
+ } catch (IllegalAccessException | InvocationTargetException e) {
+ GT_Mod.GT_FML_LOGGER.catching(e);
}
}
- //end CLS
+ else
+ GT_Proxy.stepMaterialsVanilla(this.mEvents,progressBar);
}
public static final HashMap<Integer,HashMap<ChunkCoordIntPair,int []>> dimensionWiseChunkData = new HashMap<>(16);//stores chunk data that is loaded/saved
generated by cgit (git 2.46.0) at 2025-05-19 14:00:09 +0000