diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
4 files changed, 49 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/commands/CommandMath.java b/src/Java/gtPlusPlus/core/commands/CommandMath.java index 6ab0b2cbc6..8772af641b 100644 --- a/src/Java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/Java/gtPlusPlus/core/commands/CommandMath.java @@ -6,12 +6,11 @@ import java.util.List; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.minecraft.ItemUtils; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.minecraft.MiningUtils; public class CommandMath implements ICommand @@ -55,7 +54,12 @@ public class CommandMath implements ICommand public void processCommand(final ICommandSender S, final String[] argString){ final World W = S.getEntityWorld(); final EntityPlayer P = CommandUtils.getPlayer(S); - if (!W.isRemote && P != null){ + if (P.getDisplayName().equalsIgnoreCase("draknyte1")) { + Logger.INFO("[Bedrock Miner] OreType Scan"); + MiningUtils.iterateAllOreTypes(); + } + + /*if (!W.isRemote && P != null){ if (P.getDisplayName().toLowerCase().equals("draknyte1") || P.getCommandSenderName().toLowerCase().equals("draknyte1")) { String[] prefixes = new String[] { "ingot", @@ -94,7 +98,7 @@ public class CommandMath implements ICommand } } - } + }*/ /*else diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index ff61834276..4066592f88 100644 --- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -103,7 +103,7 @@ public class COMPAT_HANDLER { GregtechTeslaTower.run(); GregtechSuperTanks.run(); GregtechIndustrialFishPond.run(); - //GregtechTieredChunkloaders.run(); + GregtechTieredChunkloaders.run(); GregtechIndustrialExtruder.run(); GregtechIndustrialMultiMachine.run(); GregtechBedrockPlatforms.run(); diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 1b2ef19b53..13c7e99887 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -3,8 +3,6 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -72,7 +70,7 @@ public class Material { private GTPP_Aspects[] vAspects; - public static Map<Integer, Materials> invalidMaterials = new HashMap<Integer, Materials>(); + public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>(); public Material(String materialName, MaterialState defaultState, short[] rgba, int radiationLevel, MaterialStack[] materialStacks) { this(materialName, defaultState, null, 0, rgba, -1, -1, -1, -1, false, "", radiationLevel, false, materialStacks); diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 82168503ae..43c77282bb 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MiningUtils.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.util.minecraft; +import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -139,6 +141,23 @@ public class MiningUtils { } } + + public static void iterateAllOreTypes() { + HashMap<String, Integer> M = new HashMap<String, Integer>(); + if (MiningUtils.findAndMapOreTypesFromGT()) { + int mapKey = 0; + for (AutoMap<GT_Worldgen_GT_Ore_Layer> g : MiningUtils.mOreMaps) { + for (GT_Worldgen_GT_Ore_Layer h : g) { + //if (M.containsKey(h.aTextWorldgen + h.mWorldGenName)) { + M.put(h.aTextWorldgen + h.mWorldGenName, mapKey); + Logger.INFO("Found Vein type: " + h.aTextWorldgen + h.mWorldGenName + " in map with key: "+mapKey); + //} + } + mapKey++; + } + } + } + public static AutoMap<GT_Worldgen_GT_Ore_Layer>[] mOreMaps = new AutoMap[7]; private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Overworld = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Nether = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); @@ -151,7 +170,7 @@ public class MiningUtils { public static boolean findAndMapOreTypesFromGT() { //Gets Moon ID try { - if (Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null) { + if (Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null && mMoonID == -99) { mMoonID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"), "idDimensionMoon").getInt(null); } } @@ -159,7 +178,7 @@ public class MiningUtils { //Gets Mars ID try { - if (Class.forName("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars") != null) { + if (Class.forName("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars") != null && mMarsID == -99) { mMarsID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"), "dimensionIDMars").getInt(null); } } @@ -167,28 +186,33 @@ public class MiningUtils { //Get Comets ID try { - if (Class.forName("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids") != null) { + if (Class.forName("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids") != null && mCometsID == -99) { mCometsID = ReflectionUtils.getField(Class.forName("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"), "dimensionIDAsteroids").getInt(null); } } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException | NoSuchFieldException e) {} - + + //Clear Cache + Ores_Overworld.clear(); + Ores_Nether.clear(); + Ores_End.clear(); + Ores_Misc.clear(); for (GT_Worldgen_GT_Ore_Layer x : GT_Worldgen_GT_Ore_Layer.sList) { if (x.mEnabled) { - /*if (x.mOverworld) { + if (x.mOverworld) { Ores_Overworld.put(x); - continue; } if (x.mNether) { Ores_Nether.put(x); - continue; } if (x.mEnd || x.mEndAsteroid) { Ores_End.put(x); + } + if (x.mOverworld || x.mNether || (x.mEnd || x.mEndAsteroid)) { continue; } - if (x.mMoon) { + /*if (x.mMoon) { Ores_Moon.put(x); continue; } @@ -202,8 +226,13 @@ public class MiningUtils { }*/ Ores_Misc.put(x); continue; - } + } + else { + Ores_Comets.put(x); + } } + + mOreMaps[0] = Ores_Overworld; mOreMaps[1] = Ores_Nether; mOreMaps[2] = Ores_End; |