aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-09-03 22:36:50 +0200
committerGitHub <noreply@github.com>2024-09-03 20:36:50 +0000
commit4f33caf2586097daa253d76ce996f9fca4e10cc3 (patch)
treeea3a8ee2baf4c5aebdd1700b940f2373e475f626 /src/main
parenta881bdb42c695433174342125696213e582e78fc (diff)
downloadGT5-Unofficial-4f33caf2586097daa253d76ce996f9fca4e10cc3.tar.gz
GT5-Unofficial-4f33caf2586097daa253d76ce996f9fca4e10cc3.tar.bz2
GT5-Unofficial-4f33caf2586097daa253d76ce996f9fca4e10cc3.zip
replace Loader.isModLoaded() calls with Mods enum cached call (#3031)
* replace Loader.isModLoaded() calls with Mods enum cached call * prevent Loader.isModLoaded calls * Revert "prevent Loader.isModLoaded calls" This reverts commit 9df23fd8db9dfe70a16be10e1d8688ee629da054. * no Loader.isModLoaded calls in gagreg --------- Co-authored-by: boubou19 <miisterunknown@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/detrav/DetravScannerMod.java10
-rw-r--r--src/main/java/detrav/items/DetravMetaGeneratedTool01.java5
-rw-r--r--src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java9
-rw-r--r--src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java12
-rw-r--r--src/main/java/galacticgreg/WorldgenOreLayerSpace.java2
-rw-r--r--src/main/java/galacticgreg/WorldgenOreSmallSpace.java2
-rw-r--r--src/main/java/galacticgreg/api/ModContainer.java41
-rw-r--r--src/main/java/galacticgreg/api/enums/ModContainers.java10
-rw-r--r--src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java2
-rw-r--r--src/main/java/galacticgreg/registry/GalacticGregRegistry.java139
-rw-r--r--src/main/java/goodgenerator/loader/Loaders.java69
-rw-r--r--src/main/java/goodgenerator/main/GoodGenerator.java4
-rw-r--r--src/main/java/gregtech/api/enums/Mods.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java4
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java4
-rw-r--r--src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java4
-rw-r--r--src/main/java/kubatech/loaders/DEFCRecipes.java4
-rw-r--r--src/main/java/tectech/TecTech.java5
-rw-r--r--src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java99
19 files changed, 181 insertions, 246 deletions
diff --git a/src/main/java/detrav/DetravScannerMod.java b/src/main/java/detrav/DetravScannerMod.java
index d9efd632a0..d79ed76010 100644
--- a/src/main/java/detrav/DetravScannerMod.java
+++ b/src/main/java/detrav/DetravScannerMod.java
@@ -3,7 +3,6 @@ package detrav;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.config.Configuration;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
@@ -28,9 +27,6 @@ public class DetravScannerMod {
public static final String MODID = "detravscannermod";
public static final boolean DEBUG_ENABLED = Boolean.parseBoolean(System.getProperty("com.detrav.debug", "false"));
public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
- public static boolean isDreamcraftLoaded = false;
- public static boolean isBartWorksLoaded = false;
- public static boolean isGTppLoaded = false;
@SidedProxy(clientSide = "detrav.proxies.ClientProxy", serverSide = "detrav.proxies.ServerProxy")
public static CommonProxy proxy;
@@ -40,10 +36,6 @@ public class DetravScannerMod {
public DetravScannerMod() {
GregTechAPI.sAfterGTPreload.add(new DetravLoaderAfterGTPreload());
- isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
- isBartWorksLoaded = Loader.isModLoaded("bartworks");
- isGTppLoaded = Loader.isModLoaded("miscutils");
-
new DetravNetwork();
}
@@ -68,7 +60,7 @@ public class DetravScannerMod {
@EventHandler
public void onPostLoad(FMLPostInitializationEvent aEvent) {
proxy.onPostLoad();
- if (isGTppLoaded) GTppHelper.generate_OreIDs();
+ GTppHelper.generate_OreIDs();
FluidColors.makeColors();
}
}
diff --git a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
index e704631467..c171f56561 100644
--- a/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
+++ b/src/main/java/detrav/items/DetravMetaGeneratedTool01.java
@@ -16,6 +16,7 @@ import detrav.items.tools.DetravProspector;
import detrav.items.tools.DetravToolElectricProspector;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.TCAspects;
import gregtech.api.interfaces.IToolStats;
import gregtech.api.items.MetaGeneratedTool;
@@ -280,7 +281,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) {
ItemStack dStack;
- if (DetravScannerMod.isDreamcraftLoaded) {
+ if (Mods.NewHorizonsCoreMod.isModLoaded()) {
// Materials at tiers
list.add(getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null));
list.add(getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null));
@@ -327,7 +328,7 @@ public class DetravMetaGeneratedTool01 extends MetaGeneratedTool {
setCharge(dStack, 409600000L);
list.add(dStack);
- if (DetravScannerMod.isDreamcraftLoaded) {
+ if (Mods.NewHorizonsCoreMod.isModLoaded()) {
dStack = getToolWithStats(
104,
1,
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
index 25da8b6277..56f97ea862 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
@@ -17,13 +17,12 @@ import net.minecraftforge.fluids.FluidStack;
import com.sinthoras.visualprospecting.VisualProspecting_API;
-import cpw.mods.fml.common.Loader;
-import detrav.DetravScannerMod;
import detrav.items.DetravMetaGeneratedTool01;
import detrav.net.DetravNetwork;
import detrav.net.ProspectingPacket;
import detrav.utils.BartWorksHelper;
import detrav.utils.GTppHelper;
+import gregtech.api.enums.Mods;
import gregtech.api.items.MetaBaseItem;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GTLanguageManager;
@@ -119,13 +118,13 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID);
}
}
- } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) {
+ } else if (GTppHelper.isGTppBlock(tBlock)) {
packet.addBlock(
c.xPosition * 16 + x,
y,
c.zPosition * 16 + z,
GTppHelper.getGTppMeta(tBlock));
- } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) {
+ } else if (BartWorksHelper.isOre(tBlock)) {
if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue;
packet.addBlock(
c.xPosition * 16 + x,
@@ -182,7 +181,7 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr
DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer);
if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size());
- if (Loader.isModLoaded("visualprospecting")) {
+ if (Mods.VisualProspecting.isModLoaded()) {
if (data == 0 || data == 1) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
diff --git a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
index c914640573..45b4c7fb29 100644
--- a/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
+++ b/src/main/java/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -23,7 +23,6 @@ import net.minecraftforge.fluids.FluidStack;
import com.sinthoras.visualprospecting.VisualProspecting_API;
import bartworks.system.material.Werkstoff;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.LanguageRegistry;
import detrav.DetravScannerMod;
import detrav.items.DetravMetaGeneratedTool01;
@@ -31,6 +30,7 @@ import detrav.utils.BartWorksHelper;
import detrav.utils.GTppHelper;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
import gregtech.api.items.MetaBaseItem;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GTLanguageManager;
@@ -82,7 +82,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
if (!aPlayer.capabilities.isCreativeMode)
((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts);
- if (Loader.isModLoaded("visualprospecting")) {
+ if (Mods.VisualProspecting.isModLoaded()) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
new ArrayList<>(),
@@ -213,7 +213,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
aPlayer.addChatMessage(msg);
}
- if (Loader.isModLoaded("visualprospecting")) {
+ if (Mods.VisualProspecting.isModLoaded()) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(
@@ -249,7 +249,7 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
addChatMassageByValue(aPlayer, value, key);
}
- if (Loader.isModLoaded("visualprospecting")) {
+ if (Mods.VisualProspecting.isModLoaded()) {
VisualProspecting_API.LogicalServer.sendProspectionResultsToClient(
(EntityPlayerMP) aPlayer,
VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(
@@ -311,10 +311,10 @@ public class BehaviourDetravToolProspector extends BehaviourNone {
addOreToHashMap(name, aPlayer);
}
}
- } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) {
+ } else if (GTppHelper.isGTppBlock(tBlock)) {
String name = GTppHelper.getGTppVeinName(tBlock);
if (!name.isEmpty()) addOreToHashMap(name, aPlayer);
- } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) {
+ } else if (BartWorksHelper.isOre(tBlock)) {
if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue;
final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault(
(short) ((BartWorksHelper.getMetaFromBlock(aChunk, x, y, z, tBlock)) * -1),
diff --git a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java
index c28eb7a392..3cd0a8baa4 100644
--- a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java
+++ b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java
@@ -54,7 +54,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen {
allowedDims = new HashMap<>();
for (ModContainer mc : GalacticGregRegistry.getModContainers()) {
- if (!mc.getEnabled()) continue;
+ if (!mc.isModLoaded()) continue;
for (ModDimensionDef mdd : mc.getDimensionList()) {
String tDimIdentifier = mdd.getDimIdentifier();
diff --git a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java
index 18dd338ec3..95b40c69eb 100644
--- a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java
+++ b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java
@@ -34,7 +34,7 @@ public class WorldgenOreSmallSpace extends GTWorldgen {
allowedDims = new HashMap<>();
for (ModContainer mc : GalacticGregRegistry.getModContainers()) {
- if (!mc.getEnabled()) continue;
+ if (!mc.isModLoaded()) continue;
for (ModDimensionDef mdd : mc.getDimensionList()) {
String tDimIdentifier = mdd.getDimIdentifier();
diff --git a/src/main/java/galacticgreg/api/ModContainer.java b/src/main/java/galacticgreg/api/ModContainer.java
index 37721cd38c..fa5a33f4c6 100644
--- a/src/main/java/galacticgreg/api/ModContainer.java
+++ b/src/main/java/galacticgreg/api/ModContainer.java
@@ -3,6 +3,8 @@ package galacticgreg.api;
import java.util.ArrayList;
import java.util.List;
+import gregtech.api.enums.Mods;
+
/**
* Defines a Mod where this Generator shall be active. Note: This will only work (obviously) for Dimensions where
* either: - Gregtech has a hook in the OreGen or - For mods which are addons to GalactiCraft
@@ -10,47 +12,30 @@ import java.util.List;
*/
public class ModContainer {
- private String _mModName;
- private List<ModDimensionDef> _mDimensionLookup;
- private boolean _mEnabled = false;
-
- /**
- * Internal function
- *
- * @return The state if the Registry could find the mod or not
- */
- public boolean getEnabled() {
- return _mEnabled;
- }
-
- /**
- * Internal function
- *
- * Never set this to true. This is an internal marker which is set by the registry if the mod could be found or not
- *
- * @param pEnabled
- */
- public void setEnabled(boolean pEnabled) {
- _mEnabled = pEnabled;
- }
+ private final List<ModDimensionDef> _mDimensionLookup;
+ private final Mods mod;
/**
* Define a new Mod where GT OreGen shall be enabled
*
- * @param pModName The modID. Make sure to use the proper mod-id, or it won't load correctly
+ * @param mod The Mods enum value.
*/
- public ModContainer(String pModName) {
- _mModName = pModName;
+ public ModContainer(Mods mod) {
+ this.mod = mod;
_mDimensionLookup = new ArrayList<>();
}
+ public boolean isModLoaded() {
+ return this.mod.isModLoaded();
+ }
+
/**
* Internal function
*
* @return The mods name
*/
public String getModName() {
- return _mModName;
+ return mod.ID;
}
/**
@@ -78,7 +63,7 @@ public class ModContainer {
}
// Set the parent modName of this dimension. This will finalize it
- pDimDef.setParentModName(_mModName);
+ pDimDef.setParentModName(mod.ID);
_mDimensionLookup.add(pDimDef);
return true;
}
diff --git a/src/main/java/galacticgreg/api/enums/ModContainers.java b/src/main/java/galacticgreg/api/enums/ModContainers.java
index 7352e5a75c..ddac1e14d5 100644
--- a/src/main/java/galacticgreg/api/enums/ModContainers.java
+++ b/src/main/java/galacticgreg/api/enums/ModContainers.java
@@ -5,11 +5,11 @@ import gregtech.api.enums.Mods;
public enum ModContainers {
- GalactiCraftCore(new ModContainer(Mods.GalacticraftCore.ID)),
- GalacticraftMars(new ModContainer(Mods.GalacticraftMars.ID)),
- GalaxySpace(new ModContainer(Mods.GalaxySpace.ID)),
- AmunRa(new ModContainer("GalacticraftAmunRa")),
- Vanilla(new ModContainer("Vanilla"));
+ GalactiCraftCore(new ModContainer(Mods.GalacticraftCore)),
+ GalacticraftMars(new ModContainer(Mods.GalacticraftMars)),
+ GalaxySpace(new ModContainer(Mods.GalaxySpace)),
+ AmunRa(new ModContainer(Mods.GalacticraftAmunRa)),
+ Vanilla(new ModContainer(Mods.Minecraft));
public final ModContainer modContainer;
diff --git a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java
index 87dad97f35..33e1f6a750 100644
--- a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java
+++ b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java
@@ -40,7 +40,7 @@ public class DynamicDimensionConfig {
public static boolean InitDynamicConfig() {
try {
for (ModContainer mc : GalacticGregRegistry.getModContainers()) {
- if (!mc.getEnabled()) continue;
+ if (!mc.isModLoaded()) continue;
for (ModDimensionDef mdd : mc.getDimensionList()) {
DimensionType dt = mdd.getDimensionType();
diff --git a/src/main/java/galacticgreg/registry/GalacticGregRegistry.java b/src/main/java/galacticgreg/registry/GalacticGregRegistry.java
index 9dc5d0fa04..ee12baeb17 100644
--- a/src/main/java/galacticgreg/registry/GalacticGregRegistry.java
+++ b/src/main/java/galacticgreg/registry/GalacticGregRegistry.java
@@ -1,14 +1,11 @@
package galacticgreg.registry;
-import static galacticgreg.api.enums.ModContainers.Vanilla;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.world.chunk.IChunkProvider;
-import cpw.mods.fml.common.Loader;
import galacticgreg.GalacticGreg;
import galacticgreg.api.Enums.DimensionType;
import galacticgreg.api.ModContainer;
@@ -22,54 +19,46 @@ import galacticgreg.generators.GenEllipsoid;
*/
public class GalacticGregRegistry {
- private static final Map<String, ModContainer> _mModContainers = new HashMap<>();
- public static final String DIM_UNKNOWN = "GGREG_DIMENSION_UNKNOWN";
- private static boolean _mInitializationDone = false;
+ private static final Map<String, ModContainer> modContainers = new HashMap<>();
+ private static boolean initializationDone = false;
/**
* Register new ModContainer in the registry. Call this after you've populated it with Dimensions and Blocks Must be
* called from your own PreInit or Init event
- *
- * @param pModContainer
- * @return
*/
- public static boolean registerModContainer(ModContainer pModContainer) {
- if (_mInitializationDone) {
+ public static void registerModContainer(ModContainer modContainer) {
+ if (initializationDone) {
GalacticGreg.Logger.warn("Initialization is already done, you can't add more ModContainers!");
- return false;
+ return;
}
- if (_mModContainers.containsKey(pModContainer.getModName())) {
+ if (modContainers.containsKey(modContainer.getModName())) {
GalacticGreg.Logger
- .warn("There is already a mod registered with that name: [%s]", pModContainer.getModName());
- return false;
- } else {
- GalacticGreg.Logger.info(
- "Registered new mod to generate ores: [%s] Dimensions provided: [%d]",
- pModContainer.getModName(),
- pModContainer.getDimensionList()
- .size());
- _mModContainers.put(pModContainer.getModName(), pModContainer);
- return true;
+ .warn("There is already a mod registered with that name: [%s]", modContainer.getModName());
+ return;
}
+
+ GalacticGreg.Logger.info(
+ "Registered new mod to generate ores: [%s] Dimensions provided: [%d]",
+ modContainer.getModName(),
+ modContainer.getDimensionList()
+ .size());
+ modContainers.put(modContainer.getModName(), modContainer);
}
/**
* Lookup the registered dimensions and try to find the DimensionDefinition that has the ChunkProvider that we have
* here
- *
- * @param pChunkProvider
- * @return
*/
- public static ModDimensionDef getDimensionTypeByChunkGenerator(IChunkProvider pChunkProvider) {
+ public static ModDimensionDef getDimensionTypeByChunkGenerator(IChunkProvider chunkProvider) {
try {
- if (!_mInitializationDone) return null;
+ if (!initializationDone) return null;
- String tFQCPN = pChunkProvider.toString()
+ String tFQCPN = chunkProvider.toString()
.split("@")[0];
ModDimensionDef tReturnMDD = null;
- for (ModContainer mc : _mModContainers.values()) {
+ for (ModContainer mc : modContainers.values()) {
for (ModDimensionDef mdd : mc.getDimensionList()) {
if (mdd.getChunkProviderName()
.equals(tFQCPN)) {
@@ -88,20 +77,18 @@ public class GalacticGregRegistry {
/**
* Get all registered modcontainers. Can only be done after the initialization process is done
- *
- * @return
*/
public static Collection<ModContainer> getModContainers() {
- if (!_mInitializationDone) return null;
+ if (!initializationDone) return null;
- return _mModContainers.values();
+ return modContainers.values();
}
/**
* Initializes the Registry. Never do this in your code, GalacticGreg will crash if you do so
*/
public static boolean InitRegistry() {
- if (_mInitializationDone) // never run init twice!
+ if (initializationDone) // never run init twice!
return false;
InitModContainers();
@@ -114,70 +101,44 @@ public class GalacticGregRegistry {
* Parse modcontainers and search for loaded mods. Enable found mods for generation
*/
private static void InitModContainers() {
- for (ModContainer mc : _mModContainers.values()) {
+ for (ModContainer mc : modContainers.values()) {
// todo: rename Vanilla mod container name from "Vanilla" to "minecraft"
- if (!Loader.isModLoaded(mc.getModName()) && !mc.getModName()
- .equals(Vanilla.modContainer.getModName())) {
+ if (!mc.isModLoaded()) {
GalacticGreg.Logger.warn(
"Ignoring ModRegistration for OreGen: [%s], because mod is not loaded. Did you misspell the name?",
mc.getModName());
- mc.setEnabled(false);
- } else {
- GalacticGreg.Logger.info("Mod [%s] is now enabled for OreGen by GalacticGreg", mc.getModName());
- mc.setEnabled(true);
- for (ModDimensionDef md : mc.getDimensionList()) {
+ continue;
+ }
+
+ GalacticGreg.Logger.info("Mod [%s] is now enabled for OreGen by GalacticGreg", mc.getModName());
+
+ for (ModDimensionDef md : mc.getDimensionList()) {
+ GalacticGreg.Logger.info(
+ "ModID: [%s] DimName: [%s] ValidBlocks: [%d] Identifier: [%s] Generators: [%d]",
+ mc.getModName(),
+ md.getDimensionName(),
+ md.getReplaceableBlocks()
+ .size(),
+ md.getDimIdentifier(),
+ md.getSpaceObjectGenerators()
+ .size());
+
+ // Register default generator if dimension is asteroid and no generator was added
+ if (md.getDimensionType() == DimensionType.Asteroid) {
+ if (md.getSpaceObjectGenerators()
+ .isEmpty()) {
+ GalacticGreg.Logger.debug("No generators found, adding built-in ellipsoid generator");
+ md.registerSpaceObjectGenerator(new GenEllipsoid());
+ }
GalacticGreg.Logger.info(
- "ModID: [%s] DimName: [%s] ValidBlocks: [%d] Identifier: [%s] Generators: [%d]",
- mc.getModName(),
- md.getDimensionName(),
- md.getReplaceableBlocks()
- .size(),
- md.getDimIdentifier(),
+ "Asteroid-Enabled dimension. Registered Generators: [%d]",
md.getSpaceObjectGenerators()
.size());
-
- // Register default generator if dimension is asteroid and no generator was added
- if (md.getDimensionType() == DimensionType.Asteroid) {
- if (md.getSpaceObjectGenerators()
- .size() == 0) {
- GalacticGreg.Logger.debug("No generators found, adding build-in ellipsoid generator");
- md.registerSpaceObjectGenerator(new GenEllipsoid());
- }
- GalacticGreg.Logger.info(
- "Asteroid-Enabled dimension. Registered Generators: [%d]",
- md.getSpaceObjectGenerators()
- .size());
- }
-
- md.finalizeReplaceableBlocks(mc.getModName());
}
- }
- }
- _mInitializationDone = true;
- }
-
- /**
- * Returns ModContainer for given DimensionDefinition
- *
- * @param pDimensionDefinition
- * @return
- */
- public static ModContainer getModContainerForDimension(ModDimensionDef pDimensionDefinition) {
- if (!_mInitializationDone) return null;
- try {
- for (ModContainer mc : _mModContainers.values()) {
- for (ModDimensionDef md : mc.getDimensionList()) {
- if (pDimensionDefinition.getDimIdentifier()
- .equals(md.getDimIdentifier())) {
- return mc;
- }
- }
+ md.finalizeReplaceableBlocks(mc.getModName());
}
- return null;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
}
+ initializationDone = true;
}
}
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java
index adc636ae34..ac58e86d3b 100644
--- a/src/main/java/goodgenerator/loader/Loaders.java
+++ b/src/main/java/goodgenerator/loader/Loaders.java
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import goodgenerator.blocks.myFluids.FluidsBuilder;
import goodgenerator.blocks.regularBlock.BlockCasing;
@@ -54,6 +53,7 @@ import goodgenerator.util.MaterialFix;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.MetaTileEntityIDs;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.render.TextureFactory;
@@ -410,41 +410,40 @@ public class Loaders {
}
public static void compactMod() {
- if (Loader.isModLoaded("Thaumcraft")) {
- LargeEssentiaEnergyData.processEssentiaData();
- GameRegistry.registerItem(upgradeEssentia, "upgradeEssentia", GoodGenerator.MOD_ID);
- GameRegistry.registerTileEntity(MTEEssentiaHatch.class, "EssentiaHatch");
- GameRegistry.registerTileEntity(MTEEssentiaOutputHatch.class, "EssentiaOutputHatch");
- GameRegistry.registerTileEntity(MTEEssentiaOutputHatchME.class, "EssentiaOutputHatch_ME");
- Loaders.LEG = new MTELargeEssentiaGenerator(
- MetaTileEntityIDs.LargeEssentiaGenerator.ID,
- "LargeEssentiaGenerator",
- "Large Essentia Generator - Marked for Deprecation").getStackForm(1L);
- Loaders.LES = new MTELargeEssentiaSmeltery(
- MetaTileEntityIDs.LargeEssentiaSmeltery.ID,
- "LargeEssentiaSmeltery",
- "Large Essentia Smeltery").getStackForm(1L);
- essentiaHatch = new BlockTEContainer(
- "essentiaHatch",
- new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" },
- 1);
- essentiaOutputHatch = new BlockTEContainer(
- "essentiaOutputHatch",
- new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch" },
- 2);
- essentiaOutputHatch_ME = new BlockTEContainer(
- "essentiaOutputHatch_ME",
- new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME" },
- 3);
- GameRegistry.registerBlock(magicCasing, GGItemBlocks.class, "magicCasing");
- GameRegistry.registerBlock(essentiaCell, GGItemBlocks.class, "essentiaCell");
- GameRegistry.registerBlock(essentiaHatch, GGItemBlocks.class, "essentiaHatch");
- GameRegistry.registerBlock(essentiaOutputHatch, GGItemBlocks.class, "essentiaOutputHatch");
- GameRegistry.registerBlock(essentiaFilterCasing, GGItemBlocks.class, "essentiaFilterCasing");
- GameRegistry.registerBlock(essentiaOutputHatch_ME, GGItemBlocks.class, "essentiaOutputHatch_ME");
+ if (!Mods.Thaumcraft.isModLoaded()) return;
+ LargeEssentiaEnergyData.processEssentiaData();
+ GameRegistry.registerItem(upgradeEssentia, "upgradeEssentia", GoodGenerator.MOD_ID);
+ GameRegistry.registerTileEntity(MTEEssentiaHatch.class, "EssentiaHatch");
+ GameRegistry.registerTileEntity(MTEEssentiaOutputHatch.class, "EssentiaOutputHatch");
+ GameRegistry.registerTileEntity(MTEEssentiaOutputHatchME.class, "EssentiaOutputHatch_ME");
+ Loaders.LEG = new MTELargeEssentiaGenerator(
+ MetaTileEntityIDs.LargeEssentiaGenerator.ID,
+ "LargeEssentiaGenerator",
+ "Large Essentia Generator - Marked for Deprecation").getStackForm(1L);
+ Loaders.LES = new MTELargeEssentiaSmeltery(
+ MetaTileEntityIDs.LargeEssentiaSmeltery.ID,
+ "LargeEssentiaSmeltery",
+ "Large Essentia Smeltery").getStackForm(1L);
+ essentiaHatch = new BlockTEContainer(
+ "essentiaHatch",
+ new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" },
+ 1);
+ essentiaOutputHatch = new BlockTEContainer(
+ "essentiaOutputHatch",
+ new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch" },
+ 2);
+ essentiaOutputHatch_ME = new BlockTEContainer(
+ "essentiaOutputHatch_ME",
+ new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME" },
+ 3);
+ GameRegistry.registerBlock(magicCasing, GGItemBlocks.class, "magicCasing");
+ GameRegistry.registerBlock(essentiaCell, GGItemBlocks.class, "essentiaCell");
+ GameRegistry.registerBlock(essentiaHatch, GGItemBlocks.class, "essentiaHatch");
+ GameRegistry.registerBlock(essentiaOutputHatch, GGItemBlocks.class, "essentiaOutputHatch");
+ GameRegistry.registerBlock(essentiaFilterCasing, GGItemBlocks.class, "essentiaFilterCasing");
+ GameRegistry.registerBlock(essentiaOutputHatch_ME, GGItemBlocks.class, "essentiaOutputHatch_ME");
- Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][0] = TextureFactory.of(magicCasing);
- }
+ Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][0] = TextureFactory.of(magicCasing);
}
public static void addOreDic() {
diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java
index efbc5b63a4..d4a12f2c5c 100644
--- a/src/main/java/goodgenerator/main/GoodGenerator.java
+++ b/src/main/java/goodgenerator/main/GoodGenerator.java
@@ -3,7 +3,6 @@ package goodgenerator.main;
import net.minecraft.creativetab.CreativeTabs;
import bartworks.API.WerkstoffAdderRegistry;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -19,6 +18,7 @@ import goodgenerator.loader.Loaders;
import goodgenerator.loader.NaquadahReworkRecipeLoader;
import goodgenerator.tabs.MyTabs;
import gregtech.GT_Version;
+import gregtech.api.enums.Mods;
@SuppressWarnings("ALL")
@Mod(
@@ -78,7 +78,7 @@ public final class GoodGenerator {
}
public static void crossMod() {
- if (Loader.isModLoaded("Thaumcraft")) {
+ if (Mods.Thaumcraft.isModLoaded()) {
Research.addResearch();
}
}
diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java
index 856817d972..366ee45eb0 100644
--- a/src/main/java/gregtech/api/enums/Mods.java
+++ b/src/main/java/gregtech/api/enums/Mods.java
@@ -34,6 +34,7 @@ public enum Mods {
BiblioWoodsNaturaEdition(Names.BIBLIO_WOODS_NATURA_EDITION),
BinnieCore(Names.BINNIE_CORE),
BiomesOPlenty(Names.BIOMES_O_PLENTY),
+ BlockRenderer6343(Names.BLOCK_RENDERER_6343),
BloodArsenal(Names.BLOOD_ARSENAL),
BloodMagic(Names.BLOOD_MAGIC),
Botania(Names.BOTANIA),
@@ -213,6 +214,7 @@ public enum Mods {
public static final String BIBLIO_WOODS_NATURA_EDITION = "BiblioWoodsNatura";
public static final String BINNIE_CORE = "BinnieCore";
public static final String BIOMES_O_PLENTY = "BiomesOPlenty";
+ public static final String BLOCK_RENDERER_6343 = "blockrenderer6343";
public static final String BLOOD_ARSENAL = "BloodArsenal";
public static final String BLOOD_MAGIC = "AWWayofTime";
public static final String BOTANIA = "Botania";
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
index b2d20b9745..e7221ef4e1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPCBFactory.java
@@ -58,9 +58,9 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget;
import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;
import blockrenderer6343.client.world.ClientFakePlayer;
-import cpw.mods.fml.common.Loader;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures.BlockIcons;
@@ -315,7 +315,7 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase<MTEPCBFactory>
public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
if (mMachine) return -1;
int built = 0;
- if (Loader.isModLoaded("blockrenderer6343") && env.getActor() instanceof ClientFakePlayer) {
+ if (Mods.BlockRenderer6343.isModLoaded() && env.getActor() instanceof ClientFakePlayer) {
if (stackSize.stackSize < 3) {
built += survivialBuildPiece(tier1, stackSize, 3, 5, 0, elementBudget, env, false, false);
if (stackSize.stackSize == 2) {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
index 22008ac647..e72079b71e 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
@@ -51,12 +51,12 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import bartworks.system.material.WerkstoffLoader;
-import cpw.mods.fml.common.Loader;
import goodgenerator.items.GGMaterial;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GTModHandler;
@@ -638,7 +638,7 @@ public class RecipesGregTech {
private static void breweryRecipes() {
- if (Loader.isModLoaded("OpenBlocks")) {
+ if (Mods.OpenBlocks.isModLoaded()) {
RA.stdBuilder()
.itemInputs(GTUtility.getIntegratedCircuit(14))
.fluidInputs(FluidRegistry.getFluidStack("mobessence", 100))
diff --git a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
index 954ac32242..785ced4006 100644
--- a/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
+++ b/src/main/java/gtneioreplugin/plugin/gregtech5/PluginGT5VeinStat.java
@@ -10,7 +10,7 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
import codechicken.nei.PositionedStack;
-import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Mods;
import gtneioreplugin.plugin.item.ItemDimensionDisplay;
import gtneioreplugin.util.DimensionHelper;
import gtneioreplugin.util.GT5OreLayerHelper;
@@ -92,7 +92,7 @@ public class PluginGT5VeinStat extends PluginGT5Base {
}
private static void drawVeinName(OreLayerWrapper oreLayer) {
- if (Loader.isModLoaded("visualprospecting")) {
+ if (Mods.VisualProspecting.isModLoaded()) {
drawVeinNameLine(I18n.format(oreLayer.veinName) + " ");
} else {
String veinName = getGTOreLocalizedName(oreLayer.Meta[OreVeinLayer.VEIN_PRIMARY]);
diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java
index 37f13c1298..f9b68cf5b7 100644
--- a/src/main/java/kubatech/loaders/DEFCRecipes.java
+++ b/src/main/java/kubatech/loaders/DEFCRecipes.java
@@ -20,12 +20,12 @@ import net.minecraftforge.fluids.FluidStack;
import com.gtnewhorizons.modularui.api.drawable.UITexture;
-import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.MaterialsUEVplus;
+import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.recipe.RecipeMap;
@@ -198,7 +198,7 @@ public class DEFCRecipes {
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
- if (Loader.isModLoaded("supersolarpanel")) {
+ if (Mods.SuperSolarPanels.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plate, Materials.DraconiumAwakened, 12),
diff --git a/src/main/java/tectech/TecTech.java b/src/main/java/tectech/TecTech.java
index 503f6ff35c..4f3dc3428d 100644
--- a/src/main/java/tectech/TecTech.java
+++ b/src/main/java/tectech/TecTech.java
@@ -1,7 +1,5 @@
package tectech;
-import static gregtech.api.enums.Mods.COFHCore;
-
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -13,6 +11,7 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import eu.usrv.yamcore.auxiliary.IngameErrorLog;
import eu.usrv.yamcore.auxiliary.LogHelper;
+import gregtech.api.enums.Mods;
import gregtech.api.objects.XSTR;
import tectech.loader.MainLoader;
import tectech.loader.TecTechConfig;
@@ -95,7 +94,7 @@ public class TecTech {
@Mod.EventHandler
@SuppressWarnings("unused")
public void Load(FMLInitializationEvent event) {
- hasCOFH = COFHCore.isModLoaded();
+ hasCOFH = Mods.COFHCore.isModLoaded();
MainLoader.load();
MainLoader.addAfterGregTechPostLoadRunner();
diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
index 7a8cad71b9..c60b0d3026 100644
--- a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
+++ b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -11,7 +11,6 @@ import static gregtech.api.enums.Mods.DraconicEvolution;
import static gregtech.api.enums.Mods.EternalSingularity;
import static gregtech.api.enums.Mods.ExtraUtilities;
import static gregtech.api.enums.Mods.GTNHIntergalactic;
-import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
import static gregtech.api.enums.Mods.GalacticraftAmunRa;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.GraviSuite;
@@ -923,57 +922,55 @@ public class ResearchStationAssemblyLine implements Runnable {
250 * 20,
6_400_000);
- if (GTPlusPlusEverglades.isModLoaded()) {
- // Insanely Ultimate Battery
- TTRecipeAdder.addResearchableAssemblylineRecipe(
- ItemList.ZPM4.get(1),
- 24_000_000,
- 1_280,
- (int) TierEU.RECIPE_UIV,
- 32,
- new Object[] { HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32),
- new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
- new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
- new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
- new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, ItemList.ZPM4.get(8L),
- ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
- ItemList.Circuit_Wafer_QPIC.get(64),
- GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
- ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
- GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
- new FluidStack[] { new FluidStack(solderUEV, 18_432),
- MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(18_432),
- Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) },
- ItemList.ZPM5.get(1),
- 300 * 20,
- (int) TierEU.RECIPE_UIV);
+ // Insanely Ultimate Battery
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
+ ItemList.ZPM4.get(1),
+ 24_000_000,
+ 1_280,
+ (int) TierEU.RECIPE_UIV,
+ 32,
+ new Object[] { HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32),
+ new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, ItemList.ZPM4.get(8L),
+ ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
+ ItemList.Circuit_Wafer_QPIC.get(64),
+ GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64),
+ ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(32),
+ GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUIV, 64) },
+ new FluidStack[] { new FluidStack(solderUEV, 18_432),
+ MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(18_432),
+ Materials.Quantium.getMolten(18_432), Materials.SuperCoolant.getFluid(128_000) },
+ ItemList.ZPM5.get(1),
+ 300 * 20,
+ (int) TierEU.RECIPE_UIV);
- // Mega Ultimate Battery
- TTRecipeAdder.addResearchableAssemblylineRecipe(
- ItemList.ZPM5.get(1L),
- 480_000_000,
- 12_288,
- (int) TierEU.RECIPE_UMV,
- 64,
- new Object[] { MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
- MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
- new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
- new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
- new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
- new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, ItemList.ZPM5.get(8L),
- ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
- ItemList.Circuit_Wafer_QPIC.get(64),
- GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
- ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
- GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
- new FluidStack[] { new FluidStack(solderUEV, 36_864),
- MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getFluidStack(36_864),
- MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(36_864),
- Materials.SuperCoolant.getFluid(256_000) },
- ItemList.ZPM6.get(1),
- 350 * 20,
- (int) TierEU.RECIPE_UMV);
- }
+ // Mega Ultimate Battery
+ TTRecipeAdder.addResearchableAssemblylineRecipe(
+ ItemList.ZPM5.get(1L),
+ 480_000_000,
+ 12_288,
+ (int) TierEU.RECIPE_UMV,
+ 64,
+ new Object[] { MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
+ MaterialsElements.STANDALONE.DRAGON_METAL.getPlateDouble(32),
+ new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 },
+ new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, ItemList.ZPM5.get(8L),
+ ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64),
+ ItemList.Circuit_Wafer_QPIC.get(64),
+ GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64),
+ ItemList.Circuit_Parts_DiodeXSMD.get(64), ItemList.Circuit_Parts_InductorXSMD.get(64),
+ GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 64) },
+ new FluidStack[] { new FluidStack(solderUEV, 36_864),
+ MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getFluidStack(36_864),
+ MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getFluidStack(36_864),
+ Materials.SuperCoolant.getFluid(256_000) },
+ ItemList.ZPM6.get(1),
+ 350 * 20,
+ (int) TierEU.RECIPE_UMV);
}
// MK4 Computer