From 0d9aab72aa570f13dc3e32e0d32b3f3a95f95e0a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 30 Jan 2023 10:56:42 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../gregtech/api/util/ColorsMetadataSection.java | 11 +- .../api/util/ColorsMetadataSectionSerializer.java | 22 +- .../java/gregtech/api/util/GT_ApiaryModifier.java | 1 + .../java/gregtech/api/util/GT_ApiaryUpgrade.java | 31 +- .../gregtech/api/util/GT_AssemblyLineUtils.java | 104 +- .../gregtech/api/util/GT_Assemblyline_Server.java | 439 +- src/main/java/gregtech/api/util/GT_BaseCrop.java | 120 +- src/main/java/gregtech/api/util/GT_BlockMap.java | 7 +- src/main/java/gregtech/api/util/GT_BlockSet.java | 1 + src/main/java/gregtech/api/util/GT_CLS_Compat.java | 38 +- .../gregtech/api/util/GT_ChunkAssociatedData.java | 95 +- .../gregtech/api/util/GT_CircuitryBehavior.java | 100 +- .../gregtech/api/util/GT_ClientPreference.java | 9 +- src/main/java/gregtech/api/util/GT_Config.java | 32 +- .../java/gregtech/api/util/GT_CoverBehavior.java | 242 +- .../gregtech/api/util/GT_CoverBehaviorBase.java | 373 +- .../java/gregtech/api/util/GT_CreativeTab.java | 4 +- .../api/util/GT_ExoticEnergyInputHelper.java | 37 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 58 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 92 +- src/main/java/gregtech/api/util/GT_GC_Compat.java | 14 +- .../gregtech/api/util/GT_HatchElementBuilder.java | 210 +- .../java/gregtech/api/util/GT_IBoxableWrapper.java | 4 +- .../api/util/GT_ItsNotMyFaultException.java | 1 + .../java/gregtech/api/util/GT_LanguageManager.java | 58 +- src/main/java/gregtech/api/util/GT_Log.java | 5 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 1040 ++--- .../api/util/GT_Multiblock_Tooltip_Builder.java | 219 +- .../gregtech/api/util/GT_OreDictUnificator.java | 112 +- .../gregtech/api/util/GT_OverclockCalculator.java | 46 +- .../gregtech/api/util/GT_PCBFactoryManager.java | 1 + .../java/gregtech/api/util/GT_ParallelHelper.java | 53 +- .../java/gregtech/api/util/GT_PlayedSound.java | 4 +- .../api/util/GT_ProcessingArray_Manager.java | 7 +- src/main/java/gregtech/api/util/GT_Recipe.java | 4724 +++++++++----------- .../gregtech/api/util/GT_RecipeRegistrator.java | 483 +- .../java/gregtech/api/util/GT_RenderingWorld.java | 17 +- .../java/gregtech/api/util/GT_Shaped_Recipe.java | 54 +- .../gregtech/api/util/GT_Shapeless_Recipe.java | 84 +- .../gregtech/api/util/GT_Single_Recipe_Check.java | 40 +- .../GT_Single_Recipe_Check_Processing_Array.java | 21 +- .../gregtech/api/util/GT_SpawnEventHandler.java | 24 +- .../gregtech/api/util/GT_StructureUtility.java | 295 +- .../gregtech/api/util/GT_TooltipDataCache.java | 22 +- src/main/java/gregtech/api/util/GT_Util.java | 56 +- src/main/java/gregtech/api/util/GT_Utility.java | 1781 ++++---- .../java/gregtech/api/util/GT_UtilityClient.java | 21 +- .../java/gregtech/api/util/IGT_HatchAdder.java | 1 + .../gregtech/api/util/ISerializableObject.java | 32 +- .../java/gregtech/api/util/LightingHelper.java | 504 +-- .../api/util/WorldSpawnedEventBuilder.java | 96 +- .../gregtech/api/util/extensions/ArrayExt.java | 1 + .../gregtech/api/util/extensions/IteratorExt.java | 4 +- 53 files changed, 5388 insertions(+), 6462 deletions(-) (limited to 'src/main/java/gregtech/api/util') diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSection.java b/src/main/java/gregtech/api/util/ColorsMetadataSection.java index c7ec2c8aa3..d8ce59f42c 100644 --- a/src/main/java/gregtech/api/util/ColorsMetadataSection.java +++ b/src/main/java/gregtech/api/util/ColorsMetadataSection.java @@ -1,21 +1,24 @@ package gregtech.api.util; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.HashMap; import java.util.Map; + import net.minecraft.client.resources.data.IMetadataSection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + @SideOnly(Side.CLIENT) public class ColorsMetadataSection implements IMetadataSection { + private final Map textColors; private final Map hexTextColors; private final Map guiTints; private final Map hexGuiTints; private final boolean guiTintEnabled; - public ColorsMetadataSection( - Map hexTextColorMap, Map hexGuiTintMap, boolean guiTintEnabled) { + public ColorsMetadataSection(Map hexTextColorMap, Map hexGuiTintMap, + boolean guiTintEnabled) { this.hexTextColors = hexTextColorMap; this.textColors = convertHexMapToIntMap(hexTextColorMap); diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java index b58c00db88..cab41e0d3b 100644 --- a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java +++ b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java @@ -1,25 +1,29 @@ package gregtech.api.util; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.client.resources.data.BaseMetadataSectionSerializer; +import net.minecraft.util.JsonUtils; + import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; -import net.minecraft.client.resources.data.BaseMetadataSectionSerializer; -import net.minecraft.util.JsonUtils; @SideOnly(Side.CLIENT) public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializer implements JsonSerializer { - public ColorsMetadataSection deserialize( - JsonElement metadataColors, Type type, JsonDeserializationContext context) { + + public ColorsMetadataSection deserialize(JsonElement metadataColors, Type type, + JsonDeserializationContext context) { // Default values boolean enableGuiTint = GregTech_API.sColoredGUI; Map hexGuiTintMap = new HashMap<>(); @@ -39,8 +43,8 @@ public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializ if (jsonObject.has("guiTint")) { JsonObject guiTints = JsonUtils.func_152754_s(jsonObject, "guiTint"); - enableGuiTint = - JsonUtils.getJsonObjectBooleanFieldValueOrDefault(guiTints, "enableGuiTintWhenPainted", true); + enableGuiTint = JsonUtils + .getJsonObjectBooleanFieldValueOrDefault(guiTints, "enableGuiTintWhenPainted", true); for (Dyes dye : Dyes.values()) { hexGuiTintMap.put(dye.mName, GT_Util.toHexString(dye.getRGBA())); diff --git a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java b/src/main/java/gregtech/api/util/GT_ApiaryModifier.java index eee97a4458..bb5c760556 100644 --- a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java +++ b/src/main/java/gregtech/api/util/GT_ApiaryModifier.java @@ -3,6 +3,7 @@ package gregtech.api.util; import net.minecraft.world.biome.BiomeGenBase; public class GT_ApiaryModifier { + public float territory = 1f; public float mutation = 1f; public float lifespan = 1f; diff --git a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java index d4b00d99b2..b54697fdfc 100644 --- a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java +++ b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java @@ -1,14 +1,17 @@ package gregtech.api.util; -import gregtech.api.enums.OrePrefixes; -import gregtech.common.items.GT_MetaGenerated_Item_03; import java.util.*; import java.util.function.BiConsumer; import java.util.function.Consumer; + import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; +import gregtech.api.enums.OrePrefixes; +import gregtech.common.items.GT_MetaGenerated_Item_03; + public enum GT_ApiaryUpgrade { + speed1(UNIQUE_INDEX.SPEED_UPGRADE, 32200, 1, (mods, n) -> mods.maxSpeed = 1), speed2(UNIQUE_INDEX.SPEED_UPGRADE, 32201, 1, (mods, n) -> mods.maxSpeed = 2), speed3(UNIQUE_INDEX.SPEED_UPGRADE, 32202, 1, (mods, n) -> mods.maxSpeed = 3), @@ -105,10 +108,10 @@ public enum GT_ApiaryUpgrade { sieve(UNIQUE_INDEX.SIEVE_UPGRADE, 32229, 1, (mods, n) -> { mods.isCollectingPollen = true; mods.energy *= 1.05f; - }), - ; + }),; private enum UNIQUE_INDEX { + SPEED_UPGRADE, PRODUCTION_UPGRADE, PLAINS_UPGRADE, @@ -130,16 +133,15 @@ public enum GT_ApiaryUpgrade { OCEAN_UPGRADE, SKY_UPGRADE, HEATER_UPGRADE, - SIEVE_UPGRADE, - ; + SIEVE_UPGRADE,; void apply(Consumer fn) { UNIQUE_UPGRADE_LIST.get(this).forEach(fn); } } - private static final EnumMap> UNIQUE_UPGRADE_LIST = - new EnumMap<>(UNIQUE_INDEX.class); + private static final EnumMap> UNIQUE_UPGRADE_LIST = new EnumMap<>( + UNIQUE_INDEX.class); private int meta = 0; private int maxnumber = 1; @@ -150,8 +152,8 @@ public enum GT_ApiaryUpgrade { private final HashSet blacklistedUpgrades = new HashSet<>(); - GT_ApiaryUpgrade( - UNIQUE_INDEX unique_index, int meta, int maxnumber, BiConsumer applier) { + GT_ApiaryUpgrade(UNIQUE_INDEX unique_index, int meta, int maxnumber, + BiConsumer applier) { this.unique_index = unique_index; this.meta = meta; this.maxnumber = maxnumber; @@ -162,11 +164,10 @@ public enum GT_ApiaryUpgrade { private void setup_static_variables() { quickLookup.put(this.meta, this); ArrayList un = UNIQUE_UPGRADE_LIST.get(this.unique_index); - if (un != null) - un.forEach((u) -> { - u.blacklistedUpgrades.add(this.id); - this.blacklistedUpgrades.add(u.id); - }); + if (un != null) un.forEach((u) -> { + u.blacklistedUpgrades.add(this.id); + this.blacklistedUpgrades.add(u.id); + }); else { un = new ArrayList<>(1); UNIQUE_UPGRADE_LIST.put(this.unique_index, un); diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java index f20a78d494..218e5bffdc 100644 --- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java @@ -2,17 +2,14 @@ package gregtech.api.util; import static gregtech.GT_Mod.GT_FML_LOGGER; -import cpw.mods.fml.common.FMLCommonHandler; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Objects; + import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -20,21 +17,26 @@ import net.minecraft.nbt.NBTTagString; import net.minecraftforge.common.util.Constants.NBT; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.FMLCommonHandler; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.objects.GT_ItemStack; +import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine; + public class GT_AssemblyLineUtils { /** * A cache of Recipes using the Output as Key. */ - private static HashMap sRecipeCacheByOutput = - new HashMap(); + private static HashMap sRecipeCacheByOutput = new HashMap(); /** * A cache of Recipes using the Recipe Hash String as Key. */ - private static HashMap sRecipeCacheByRecipeHash = - new HashMap(); + private static HashMap sRecipeCacheByRecipeHash = new HashMap(); /** * Checks the DataStick for deprecated/invalid recipes, updating them as required. + * * @param aDataStick - The DataStick to process * @return Is this DataStick now valid with a current recipe? */ @@ -55,6 +57,7 @@ public class GT_AssemblyLineUtils { /** * Finds an Assembly Line recipe from a DataStick. + * * @param aDataStick - The DataStick to check. * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any. */ @@ -64,8 +67,10 @@ public class GT_AssemblyLineUtils { /** * Finds an Assembly Line recipe from a DataStick. - * @param aDataStick - The DataStick to check. - * @param aReturnBuiltRecipe - Do we return a GT_Recipe_AssemblyLine built from the data on the Data Stick instead of searching the Recipe Map? + * + * @param aDataStick - The DataStick to check. + * @param aReturnBuiltRecipe - Do we return a GT_Recipe_AssemblyLine built from the data on the Data Stick instead + * of searching the Recipe Map? * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any. */ @Nonnull @@ -131,8 +136,7 @@ public class GT_AssemblyLineUtils { GT_FML_LOGGER.info("Fluid " + i + " " + tLoaded.getUnlocalizedName()); } } - if (!aTag.hasKey("output") - || !aTag.hasKey("time") + if (!aTag.hasKey("output") || !aTag.hasKey("time") || aTag.getInteger("time") <= 0 || !aTag.hasKey("eu") || !GT_Utility.isStackValid(aOutput)) { @@ -147,14 +151,15 @@ public class GT_AssemblyLineUtils { // Try build a recipe instance if (aReturnBuiltRecipe) { - return LookupResultType.VALID_STACK_AND_VALID_HASH.getResult(new GT_Recipe_AssemblyLine( - null, - 0, - aInputs.toArray(new ItemStack[0]), - aFluidInputs.toArray(new FluidStack[0]), - aOutput, - aTime, - aEU)); + return LookupResultType.VALID_STACK_AND_VALID_HASH.getResult( + new GT_Recipe_AssemblyLine( + null, + 0, + aInputs.toArray(new ItemStack[0]), + aFluidInputs.toArray(new FluidStack[0]), + aOutput, + aTime, + aEU)); } for (GT_Recipe_AssemblyLine aRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { @@ -186,13 +191,13 @@ public class GT_AssemblyLineUtils { } private static boolean areStacksEqual(ItemStack[] lhs, List rhs) { - return lhs == null - ? rhs.isEmpty() + return lhs == null ? rhs.isEmpty() : !rhs.isEmpty() && GT_Utility.areStackListsEqual(Arrays.asList(lhs), rhs, false, true); } /** * Finds a GT_Recipe_AssemblyLine based on the expected output ItemStack. + * * @param aOutput - The Output of a GT_Recipe_AssemblyLine. * @return First found GT_Recipe_AssemblyLine with matching output. */ @@ -273,8 +278,7 @@ public class GT_AssemblyLineUtils { * @return Does this Data Stick have a valid output ItemStack? */ public static boolean doesDataStickHaveOutput(ItemStack aDataStick) { - if (isItemDataStick(aDataStick) - && aDataStick.hasTagCompound() + if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound() && aDataStick.getTagCompound().hasKey("output")) { return true; } @@ -306,8 +310,7 @@ public class GT_AssemblyLineUtils { public static boolean doesDataStickHaveRecipeHash(ItemStack aDataStick) { if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound()) { NBTTagCompound aNBT = aDataStick.getTagCompound(); - if (aNBT.hasKey("Data.Recipe.Hash") - && !aNBT.getString("Data.Recipe.Hash").equals("Hash.0")) { + if (aNBT.hasKey("Data.Recipe.Hash") && !aNBT.getString("Data.Recipe.Hash").equals("Hash.0")) { return true; } } @@ -316,6 +319,7 @@ public class GT_AssemblyLineUtils { /** * Get the Output ItemStack from a Data Stick. + * * @param aDataStick - The Data Stick to check. * @return Output ItemStack contained on the Data Stick. */ @@ -329,9 +333,11 @@ public class GT_AssemblyLineUtils { /** * @param aDataStick - The Data Stick to process. - * @return The stored Recipe Hash String on the Data Stick, will return an invalid Hash if one is not found.

- * The hash will be guaranteed to pass isValidHash().

- * Will not return Null. + * @return The stored Recipe Hash String on the Data Stick, will return an invalid Hash if one is not found. + *

+ * The hash will be guaranteed to pass isValidHash(). + *

+ * Will not return Null. */ public static String getHashFromDataStack(ItemStack aDataStick) { if (isItemDataStick(aDataStick) && aDataStick.hasTagCompound()) { @@ -346,7 +352,7 @@ public class GT_AssemblyLineUtils { /** * - * @param aDataStick - The Data Stick to update. + * @param aDataStick - The Data Stick to update. * @param aRecipeHash - The Recipe Hash String to update with. * @return Did we update the Recipe Hash String on the Data Stick? */ @@ -379,8 +385,12 @@ public class GT_AssemblyLineUtils { String aHash = generateRecipeHash(aNewRecipe); if (GT_Values.D1) { GT_Recipe_AssemblyLine aOldRecipe = findAssemblyLineRecipeFromDataStick(aDataStick, true).recipe; - GT_FML_LOGGER.info("Updating data stick: " + aDataStick.getDisplayName() + " | Old Recipe Hash: " - + generateRecipeHash(aOldRecipe) + ", New Recipe Hash: " + aHash); + GT_FML_LOGGER.info( + "Updating data stick: " + aDataStick.getDisplayName() + + " | Old Recipe Hash: " + + generateRecipeHash(aOldRecipe) + + ", New Recipe Hash: " + + aHash); } String author = "Assembling Line Recipe Generator"; @@ -434,8 +444,15 @@ public class GT_AssemblyLineUtils { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mOutput.getDisplayName()); if (s == null) s = aNewRecipe.mOutput.getDisplayName(); } - tNBTList.appendTag(new NBTTagString("Construction plan for " + aNewRecipe.mOutput.stackSize + " " + s - + ". Needed EU/t: " + aNewRecipe.mEUt + " Production time: " + (aNewRecipe.mDuration / 20))); + tNBTList.appendTag( + new NBTTagString( + "Construction plan for " + aNewRecipe.mOutput.stackSize + + " " + + s + + ". Needed EU/t: " + + aNewRecipe.mEUt + + " Production time: " + + (aNewRecipe.mDuration / 20))); for (int i = 0; i < aNewRecipe.mInputs.length; i++) { if (aNewRecipe.mOreDictAlt[i] != null) { int count = 0; @@ -448,10 +465,7 @@ public class GT_AssemblyLineUtils { if (s == null) s = tStack.getDisplayName(); } - tBuilder.append(count == 0 ? "" : "\nOr ") - .append(tStack.stackSize) - .append(" ") - .append(s); + tBuilder.append(count == 0 ? "" : "\nOr ").append(tStack.stackSize).append(" ").append(s); count++; } } @@ -462,8 +476,9 @@ public class GT_AssemblyLineUtils { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mInputs[i].getDisplayName()); if (s == null) s = aNewRecipe.mInputs[i].getDisplayName(); } - tNBTList.appendTag(new NBTTagString( - "Input Bus " + (i + 1) + ": " + aNewRecipe.mInputs[i].stackSize + " " + s)); + tNBTList.appendTag( + new NBTTagString( + "Input Bus " + (i + 1) + ": " + aNewRecipe.mInputs[i].stackSize + " " + s)); } } for (int i = 0; i < aNewRecipe.mFluidInputs.length; i++) { @@ -473,8 +488,9 @@ public class GT_AssemblyLineUtils { s = GT_Assemblyline_Server.lServerNames.get(aNewRecipe.mFluidInputs[i].getLocalizedName()); if (s == null) s = aNewRecipe.mFluidInputs[i].getLocalizedName(); } - tNBTList.appendTag(new NBTTagString( - "Input Hatch " + (i + 1) + ": " + aNewRecipe.mFluidInputs[i].amount + "L " + s)); + tNBTList.appendTag( + new NBTTagString( + "Input Hatch " + (i + 1) + ": " + aNewRecipe.mFluidInputs[i].amount + "L " + s)); } } tNBT.setTag("pages", tNBTList); @@ -488,6 +504,7 @@ public class GT_AssemblyLineUtils { } public enum LookupResultType { + INVALID_STICK(true), VALID_STACK_BUT_INVALID_RECIPE(true), VALID_STACK_AND_VALID_RECIPE(false), @@ -514,6 +531,7 @@ public class GT_AssemblyLineUtils { } public static class LookupResult { + private final GT_Recipe_AssemblyLine recipe; private final LookupResultType type; diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java index 15d11cda63..a455fcf916 100644 --- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java +++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java @@ -1,30 +1,30 @@ package gregtech.api.util; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsBotania; import java.io.File; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; + import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import gregtech.api.GregTech_API; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; + public class GT_Assemblyline_Server { public static LinkedHashMap lServerNames = new LinkedHashMap(); private static LinkedHashMap internal2 = new LinkedHashMap(), - internal3 = new LinkedHashMap(), - internal4 = new LinkedHashMap(); + internal3 = new LinkedHashMap(), internal4 = new LinkedHashMap(); private static HashMap internal = new HashMap(); public static void fillMap(FMLPreInitializationEvent aEvent) { String s = new String(aEvent.getModConfigurationDirectory().getAbsolutePath()); - s = s.substring( - 0, aEvent.getModConfigurationDirectory().getAbsolutePath().length() - 6); + s = s.substring(0, aEvent.getModConfigurationDirectory().getAbsolutePath().length() - 6); s = s + "GregTech.lang"; File f = new File(s); s = ""; @@ -40,131 +40,103 @@ public class GT_Assemblyline_Server { else if (entry.getKey().contains("blockmachines") && s.contains("material")) internal3.put(entry.getKey(), s); else if ((entry.getKey().contains("blockores") - || (entry.getKey().contains("blockmetal") - || entry.getKey().contains("blockgem"))) - && s.contains("material")) internal4.put(entry.getKey(), s); + || (entry.getKey().contains("blockmetal") || entry.getKey().contains("blockgem"))) + && s.contains("material")) + internal4.put(entry.getKey(), s); else lServerNames.put(entry.getKey(), s); - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } for (Map.Entry entry : internal2.entrySet()) { try { if (entry.getKey().contains("name")) { - int i = Integer.parseInt(entry.getKey() - .substring( - "gt.metaitem.01.".length(), entry.getKey().length() - ".name".length())); + int i = Integer.parseInt( + entry.getKey() + .substring("gt.metaitem.01.".length(), entry.getKey().length() - ".name".length())); i = i % 1000; - if (GregTech_API.sGeneratedMaterials[i] != null) - lServerNames.put( - entry.getKey(), - entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString())); + if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put( + entry.getKey(), + entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString())); else lServerNames.put(entry.getKey(), null); } - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } for (Map.Entry entry : internal3.entrySet()) { try { - if (entry.getKey().contains("cable")) - lServerNames.put( - entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.cable.".length(), - entry.getKey().length() - ".01.name".length()))); - else if (entry.getKey().contains("gt_frame_")) - lServerNames.put( - entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.gt_frame_".length(), - entry.getKey().length() - ".name".length()))); + if (entry.getKey().contains("cable")) lServerNames.put( + entry.getKey(), + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.cable.".length(), + entry.getKey().length() - ".01.name".length()))); + else if (entry.getKey().contains("gt_frame_")) lServerNames.put( + entry.getKey(), + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.gt_frame_".length(), + entry.getKey().length() - ".name".length()))); else if (entry.getKey().contains("gt_pipe_")) { - if (!entry.getKey().contains("_huge") - && !entry.getKey().contains("_large") + if (!entry.getKey().contains("_huge") && !entry.getKey().contains("_large") && !entry.getKey().contains("_nonuple") && !entry.getKey().contains("_quadruple") && !entry.getKey().contains("_small") && !entry.getKey().contains("_tiny")) lServerNames.put( entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - ".name".length()))); - else if (entry.getKey().contains("_huge") || entry.getKey().contains("_tiny")) - lServerNames.put( - entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_tiny.name".length()))); - else if (entry.getKey().contains("_large") || entry.getKey().contains("_small")) - lServerNames.put( - entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_large.name".length()))); - else if (entry.getKey().contains("_nonuple")) - lServerNames.put( - entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_nonuple.name".length()))); - else if (entry.getKey().contains("_quadruple")) - lServerNames.put( - entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.gt_pipe_".length(), - entry.getKey().length() - "_quadruple.name".length()))); - } else if (entry.getKey().contains("wire")) - lServerNames.put( + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey().length() - ".name".length()))); + else if (entry.getKey().contains("_huge") || entry.getKey().contains("_tiny")) lServerNames.put( entry.getKey(), - entry.getValue() - .replace( - "material", - entry.getKey() - .substring( - "gt.blockmachines.wire.".length(), - entry.getKey().length() - ".01.name".length()))); + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey().length() - "_tiny.name".length()))); + else if (entry.getKey().contains("_large") || entry.getKey().contains("_small")) lServerNames.put( + entry.getKey(), + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey().length() - "_large.name".length()))); + else if (entry.getKey().contains("_nonuple")) lServerNames.put( + entry.getKey(), + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey().length() - "_nonuple.name".length()))); + else if (entry.getKey().contains("_quadruple")) lServerNames.put( + entry.getKey(), + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.gt_pipe_".length(), + entry.getKey().length() - "_quadruple.name".length()))); + } else if (entry.getKey().contains("wire")) lServerNames.put( + entry.getKey(), + entry.getValue().replace( + "material", + entry.getKey().substring( + "gt.blockmachines.wire.".length(), + entry.getKey().length() - ".01.name".length()))); else lServerNames.put(entry.getKey(), entry.getValue()); - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } for (Map.Entry entry : internal4.entrySet()) { try { if (entry.getKey().contains("blockores")) { - int i = Integer.parseInt(entry.getKey() - .substring("gt.blockores.".length(), entry.getKey().length() - ".name".length())); + int i = Integer.parseInt( + entry.getKey() + .substring("gt.blockores.".length(), entry.getKey().length() - ".name".length())); i = i % 1000; - if (GregTech_API.sGeneratedMaterials[i] != null) - lServerNames.put( - entry.getKey(), - entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString())); + if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put( + entry.getKey(), + entry.getValue().replace("material", GregTech_API.sGeneratedMaterials[i].toString())); else lServerNames.put(entry.getKey(), null); } else if (entry.getKey().contains("blockmetal")) { Materials[] mMats = null; @@ -173,168 +145,64 @@ public class GT_Assemblyline_Server { int i = Integer.parseInt(t); switch (i) { case 1: - mMats = new Materials[] { - Materials.Adamantium, - Materials.Aluminium, - Materials.Americium, - Materials.AnnealedCopper, - Materials.Antimony, - Materials.Arsenic, - Materials.AstralSilver, - Materials.BatteryAlloy, - Materials.Beryllium, - Materials.Bismuth, - Materials.BismuthBronze, - Materials.BlackBronze, - Materials.BlackSteel, - Materials.BlueAlloy, - Materials.BlueSteel, - Materials.Brass - }; + mMats = new Materials[] { Materials.Adamantium, Materials.Aluminium, Materials.Americium, + Materials.AnnealedCopper, Materials.Antimony, Materials.Arsenic, + Materials.AstralSilver, Materials.BatteryAlloy, Materials.Beryllium, + Materials.Bismuth, Materials.BismuthBronze, Materials.BlackBronze, + Materials.BlackSteel, Materials.BlueAlloy, Materials.BlueSteel, Materials.Brass }; break; case 2: - mMats = new Materials[] { - Materials.Bronze, - Materials.Caesium, - Materials.Cerium, - Materials.Chrome, - Materials.ChromiumDioxide, - Materials.Cobalt, - Materials.CobaltBrass, - Materials.Copper, - Materials.Cupronickel, - Materials.DamascusSteel, - Materials.DarkIron, - Materials.DeepIron, - Materials.Desh, - Materials.Duranium, - Materials.Dysprosium, - Materials.Electrum - }; + mMats = new Materials[] { Materials.Bronze, Materials.Caesium, Materials.Cerium, + Materials.Chrome, Materials.ChromiumDioxide, Materials.Cobalt, + Materials.CobaltBrass, Materials.Copper, Materials.Cupronickel, + Materials.DamascusSteel, Materials.DarkIron, Materials.DeepIron, Materials.Desh, + Materials.Duranium, Materials.Dysprosium, Materials.Electrum }; break; case 3: - mMats = new Materials[] { - Materials.ElectrumFlux, - Materials.Enderium, - Materials.Erbium, - Materials.Europium, - Materials.FierySteel, - Materials.Gadolinium, - Materials.Gallium, - Materials.Holmium, - Materials.HSLA, - Materials.Indium, - Materials.InfusedGold, - Materials.Invar, - Materials.Iridium, - Materials.IronMagnetic, - Materials.IronWood, - Materials.Kanthal - }; + mMats = new Materials[] { Materials.ElectrumFlux, Materials.Enderium, Materials.Erbium, + Materials.Europium, Materials.FierySteel, Materials.Gadolinium, Materials.Gallium, + Materials.Holmium, Materials.HSLA, Materials.Indium, Materials.InfusedGold, + Materials.Invar, Materials.Iridium, Materials.IronMagnetic, Materials.IronWood, + Materials.Kanthal }; break; case 4: - mMats = new Materials[] { - Materials.Knightmetal, - Materials.Lanthanum, - Materials.Lead, - Materials.Lutetium, - Materials.Magnalium, - Materials.Magnesium, - Materials.Manganese, - Materials.MeteoricIron, - Materials.MeteoricSteel, - Materials.Trinium, - Materials.Mithril, - Materials.Molybdenum, - Materials.Naquadah, - Materials.NaquadahAlloy, - Materials.NaquadahEnriched, - Materials.Naquadria - }; + mMats = new Materials[] { Materials.Knightmetal, Materials.Lanthanum, Materials.Lead, + Materials.Lutetium, Materials.Magnalium, Materials.Magnesium, Materials.Manganese, + Materials.MeteoricIron, Materials.MeteoricSteel, Materials.Trinium, + Materials.Mithril, Materials.Molybdenum, Materials.Naquadah, + Materials.NaquadahAlloy, Materials.NaquadahEnriched, Materials.Naquadria }; break; case 5: - mMats = new Materials[] { - Materials.Neodymium, - Materials.NeodymiumMagnetic, - Materials.Neutronium, - Materials.Nichrome, - Materials.Nickel, - Materials.Niobium, - Materials.NiobiumNitride, - Materials.NiobiumTitanium, - Materials.Osmiridium, - Materials.Osmium, - Materials.Palladium, - Materials.PigIron, - Materials.Platinum, - Materials.Plutonium, - Materials.Plutonium241, - Materials.Praseodymium - }; + mMats = new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, + Materials.Neutronium, Materials.Nichrome, Materials.Nickel, Materials.Niobium, + Materials.NiobiumNitride, Materials.NiobiumTitanium, Materials.Osmiridium, + Materials.Osmium, Materials.Palladium, Materials.PigIron, Materials.Platinum, + Materials.Plutonium, Materials.Plutonium241, Materials.Praseodymium }; break; case 6: - mMats = new Materials[] { - Materials.Promethium, - Materials.RedAlloy, - Materials.RedSteel, - Materials.RoseGold, - Materials.Rubidium, - Materials.Samarium, - Materials.Scandium, - Materials.ShadowIron, - Materials.ShadowSteel, - Materials.Silicon, - Materials.Silver, - Materials.SolderingAlloy, - Materials.StainlessSteel, - Materials.Steel, - Materials.SteelMagnetic, - Materials.SterlingSilver - }; + mMats = new Materials[] { Materials.Promethium, Materials.RedAlloy, Materials.RedSteel, + Materials.RoseGold, Materials.Rubidium, Materials.Samarium, Materials.Scandium, + Materials.ShadowIron, Materials.ShadowSteel, Materials.Silicon, Materials.Silver, + Materials.SolderingAlloy, Materials.StainlessSteel, Materials.Steel, + Materials.SteelMagnetic, Materials.SterlingSilver }; break; case 7: - mMats = new Materials[] { - Materials.Sunnarium, - Materials.Tantalum, - Materials.Tellurium, - Materials.Terbium, - Materials.Thaumium, - Materials.Thorium, - Materials.Thulium, - Materials.Tin, - Materials.TinAlloy, - Materials.Titanium, - Materials.Tritanium, - Materials.Tungsten, - Materials.TungstenSteel, - Materials.Ultimet, - Materials.Uranium, - Materials.Uranium235 - }; + mMats = new Materials[] { Materials.Sunnarium, Materials.Tantalum, Materials.Tellurium, + Materials.Terbium, Materials.Thaumium, Materials.Thorium, Materials.Thulium, + Materials.Tin, Materials.TinAlloy, Materials.Titanium, Materials.Tritanium, + Materials.Tungsten, Materials.TungstenSteel, Materials.Ultimet, Materials.Uranium, + Materials.Uranium235 }; break; case 8: - mMats = new Materials[] { - Materials.Vanadium, - Materials.VanadiumGallium, - Materials.WroughtIron, - Materials.Ytterbium, - Materials.Yttrium, - Materials.YttriumBariumCuprate, - Materials.Zinc, - Materials.TungstenCarbide, - Materials.VanadiumSteel, - Materials.HSSG, - Materials.HSSE, - Materials.HSSS, - Materials.Steeleaf, - Materials.Ichorium, - Materials.Firestone - }; + mMats = new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, + Materials.WroughtIron, Materials.Ytterbium, Materials.Yttrium, + Materials.YttriumBariumCuprate, Materials.Zinc, Materials.TungstenCarbide, + Materials.VanadiumSteel, Materials.HSSG, Materials.HSSE, Materials.HSSS, + Materials.Steeleaf, Materials.Ichorium, Materials.Firestone }; break; } t = entry.getKey() - .substring( - "gt.blockmetal1.".length(), entry.getKey().length() - ".name".length()); + .substring("gt.blockmetal1.".length(), entry.getKey().length() - ".name".length()); i = Integer.parseInt(t); lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString()); mMats = null; @@ -345,66 +213,31 @@ public class GT_Assemblyline_Server { int i = Integer.parseInt(t); switch (i) { case 1: - mMats = new Materials[] { - Materials.InfusedAir, - Materials.Amber, - Materials.Amethyst, - Materials.InfusedWater, - Materials.BlueTopaz, - Materials.CertusQuartz, - Materials.Dilithium, - Materials.EnderEye, - Materials.EnderPearl, - Materials.FoolsRuby, - Materials.Force, - Materials.Forcicium, - Materials.Forcillium, - Materials.GreenSapphire, - Materials.InfusedFire, - Materials.Jasper, - MaterialsBotania.ManaDiamond, - MaterialsBotania.BotaniaDragonstone - }; + mMats = new Materials[] { Materials.InfusedAir, Materials.Amber, Materials.Amethyst, + Materials.InfusedWater, Materials.BlueTopaz, Materials.CertusQuartz, + Materials.Dilithium, Materials.EnderEye, Materials.EnderPearl, Materials.FoolsRuby, + Materials.Force, Materials.Forcicium, Materials.Forcillium, Materials.GreenSapphire, + Materials.InfusedFire, Materials.Jasper, MaterialsBotania.ManaDiamond, + MaterialsBotania.BotaniaDragonstone }; break; case 2: - mMats = new Materials[] { - Materials.Lazurite, - Materials.Lignite, - Materials.Monazite, - Materials.Niter, - Materials.Olivine, - Materials.Opal, - Materials.InfusedOrder, - Materials.InfusedEntropy, - Materials.Phosphorus, - Materials.Quartzite, - Materials.GarnetRed, - Materials.Ruby, - Materials.Sapphire, - Materials.Sodalite, - Materials.Tanzanite, - Materials.InfusedEarth - }; + mMats = new Materials[] { Materials.Lazurite, Materials.Lignite, Materials.Monazite, + Materials.Niter, Materials.Olivine, Materials.Opal, Materials.InfusedOrder, + Materials.InfusedEntropy, Materials.Phosphorus, Materials.Quartzite, + Materials.GarnetRed, Materials.Ruby, Materials.Sapphire, Materials.Sodalite, + Materials.Tanzanite, Materials.InfusedEarth }; break; case 3: - mMats = new Materials[] { - Materials.Topaz, - Materials.Vinteum, - Materials.GarnetYellow, - Materials.NetherStar, - Materials.Charcoal, - Materials.Blaze - }; + mMats = new Materials[] { Materials.Topaz, Materials.Vinteum, Materials.GarnetYellow, + Materials.NetherStar, Materials.Charcoal, Materials.Blaze }; break; } - t = entry.getKey() - .substring("gt.blockgem1.".length(), entry.getKey().length() - ".name".length()); + t = entry.getKey().substring("gt.blockgem1.".length(), entry.getKey().length() - ".name".length()); i = Integer.parseInt(t); lServerNames.put(entry.getKey(), "Block of " + mMats[i].toString()); mMats = null; } - } catch (Exception ignored) { - } + } catch (Exception ignored) {} } internal = null; diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index 930badfdba..65d2900176 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -2,6 +2,16 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import speiger.src.crops.api.ICropCardInfo; import cpw.mods.fml.common.Loader; import gregtech.GT_Mod; import gregtech.api.GregTech_API; @@ -14,23 +24,12 @@ import gregtech.common.blocks.GT_TileEntity_Ores; import ic2.api.crops.CropCard; import ic2.api.crops.Crops; import ic2.api.crops.ICropTile; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import speiger.src.crops.api.ICropCardInfo; public class GT_BaseCrop extends CropCard implements ICropCardInfo { + public static ArrayList sCropList = new ArrayList(); private String mName = E, mDiscoveredBy = "Gregorius Techneticies", mAttributes[]; - private int mTier = 0, - mMaxSize = 0, - mAfterHarvestSize = 0, - mHarvestSize = 0, - mStats[] = new int[5], + private int mTier = 0, mMaxSize = 0, mAfterHarvestSize = 0, mHarvestSize = 0, mStats[] = new int[5], mGrowthSpeed = 0; private ItemStack mDrop = null, mSpecialDrops[] = null; private Materials mBlock = null; @@ -49,23 +48,9 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { * @param aGrowthSpeed how fast the Crop grows. if < 0 then its set to Tier*300 * @param aHarvestSize the size the Crop needs to be harvested. forced to be between 2 and max size */ - public GT_BaseCrop( - int aID, - String aCropName, - String aDiscoveredBy, - ItemStack aBaseSeed, - int aTier, - int aMaxSize, - int aGrowthSpeed, - int aAfterHarvestSize, - int aHarvestSize, - int aStatChemical, - int aStatFood, - int aStatDefensive, - int aStatColor, - int aStatWeed, - String[] aAttributes, - ItemStack aDrop, + public GT_BaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aBaseSeed, int aTier, int aMaxSize, + int aGrowthSpeed, int aAfterHarvestSize, int aHarvestSize, int aStatChemical, int aStatFood, + int aStatDefensive, int aStatColor, int aStatWeed, String[] aAttributes, ItemStack aDrop, ItemStack[] aSpecialDrops) { new GT_BaseCrop( aID, @@ -102,24 +87,9 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { * @param aHarvestSize the size the Crop needs to be harvested. forced to be between 2 and max size * @param aBlock the block below needed for crop to grow. If null no block needed */ - public GT_BaseCrop( - int aID, - String aCropName, - String aDiscoveredBy, - ItemStack aBaseSeed, - int aTier, - int aMaxSize, - int aGrowthSpeed, - int aAfterHarvestSize, - int aHarvestSize, - int aStatChemical, - int aStatFood, - int aStatDefensive, - int aStatColor, - int aStatWeed, - String[] aAttributes, - Materials aBlock, - ItemStack aDrop, + public GT_BaseCrop(int aID, String aCropName, String aDiscoveredBy, ItemStack aBaseSeed, int aTier, int aMaxSize, + int aGrowthSpeed, int aAfterHarvestSize, int aHarvestSize, int aStatChemical, int aStatFood, + int aStatDefensive, int aStatColor, int aStatWeed, String[] aAttributes, Materials aBlock, ItemStack aDrop, ItemStack[] aSpecialDrops) { mName = aCropName; aID = GT_Config.addIDConfig(ConfigCategories.IDs.crops, mName.replaceAll(" ", "_"), aID); @@ -149,10 +119,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { try { Class.forName("speiger.src.crops.api.CropPluginAPI") .getMethod("registerCropInfo", Class.forName("speiger.src.crops.api.ICropCardInfo")) - .invoke( - Class.forName("speiger.src.crops.api.CropPluginAPI") - .getField("instance"), - this); + .invoke(Class.forName("speiger.src.crops.api.CropPluginAPI").getField("instance"), this); } catch (IllegalAccessException ex) { bIc2NeiLoaded = false; } catch (IllegalArgumentException ex) { @@ -267,12 +234,13 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { Block tBlock = aCrop.getWorld() .getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); if ((tBlock instanceof GT_Block_Ores_Abstract)) { - TileEntity tTileEntity = aCrop.getWorld() - .getTileEntity( - aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); + TileEntity tTileEntity = aCrop.getWorld().getTileEntity( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { - Materials tMaterial = - GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000)]; + Materials tMaterial = GregTech_API.sGeneratedMaterials[(((GT_TileEntity_Ores) tTileEntity).mMetaData + % 1000)]; if ((tMaterial != null) && (tMaterial != Materials._NULL)) { if (tMaterial == mBlock) { return true; @@ -282,33 +250,32 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { } } } else { - int tMetaID = aCrop.getWorld() - .getBlockMetadata( - aCrop.getLocation().posX, aCrop.getLocation().posY - i, aCrop.getLocation().posZ); + int tMetaID = aCrop.getWorld().getBlockMetadata( + aCrop.getLocation().posX, + aCrop.getLocation().posY - i, + aCrop.getLocation().posZ); ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) - && (tAssotiation.mPrefix.toString().startsWith("ore")) + if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore")) && (tAssotiation.mMaterial.mMaterial == mBlock)) { return true; } - if ((tAssotiation != null) - && (tAssotiation.mPrefix == OrePrefixes.block) + if ((tAssotiation != null) && (tAssotiation.mPrefix == OrePrefixes.block) && (tAssotiation.mMaterial.mMaterial == mBlock)) { return true; } } - // Block block = aCrop.getWorld().getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, + // Block block = aCrop.getWorld().getBlock(aCrop.getLocation().posX, aCrop.getLocation().posY - i, // aCrop.getLocation().posZ); - // if (block.isAir(aCrop.getWorld(), aCrop.getLocation().posX, aCrop.getLocation().posY - i, + // if (block.isAir(aCrop.getWorld(), aCrop.getLocation().posX, aCrop.getLocation().posY - i, // aCrop.getLocation().posZ)) { - // return false; - // } - // if (block == mBlock) { - // int tMeta = aCrop.getWorld().getBlockMetadata(aCrop.getLoc