diff options
Diffstat (limited to 'src/main/java/kubatech')
13 files changed, 17 insertions, 67 deletions
diff --git a/src/main/java/kubatech/api/helpers/GTHelper.java b/src/main/java/kubatech/api/helpers/GTHelper.java index e368c7b778..a9462bdf65 100644 --- a/src/main/java/kubatech/api/helpers/GTHelper.java +++ b/src/main/java/kubatech/api/helpers/GTHelper.java @@ -20,7 +20,6 @@ package kubatech.api.helpers; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity; import static kubatech.api.Variables.ln4; import java.io.IOException; @@ -41,7 +40,7 @@ public class GTHelper { if (mte instanceof KubaTechGTMultiBlockBase) return ((KubaTechGTMultiBlockBase<?>) mte).getMaxInputEu(); long rEU = 0; for (GT_MetaTileEntity_Hatch_Energy tHatch : mte.mEnergyHatches) - if (isValidMetaTileEntity(tHatch)) rEU += tHatch.maxEUInput() * tHatch.maxAmperesIn(); + if (tHatch.isValid()) rEU += tHatch.maxEUInput() * tHatch.maxAmperesIn(); return rEU; } diff --git a/src/main/java/kubatech/api/utils/ModUtils.java b/src/main/java/kubatech/api/utils/ModUtils.java index 28165adacf..dde0b987a9 100644 --- a/src/main/java/kubatech/api/utils/ModUtils.java +++ b/src/main/java/kubatech/api/utils/ModUtils.java @@ -23,7 +23,6 @@ package kubatech.api.utils; import net.minecraft.launchwrapper.Launch; import cpw.mods.fml.common.FMLCommonHandler; -import kubatech.kubatech; public class ModUtils { diff --git a/src/main/java/kubatech/commands/CommandHandler.java b/src/main/java/kubatech/commands/CommandHandler.java index 599d690f21..9a7654cd4f 100644 --- a/src/main/java/kubatech/commands/CommandHandler.java +++ b/src/main/java/kubatech/commands/CommandHandler.java @@ -142,8 +142,9 @@ public class CommandHandler extends CommandBase { try { addCommand( (ICommand) Class.forName(clazz.name.replace("/", ".")) + .getConstructor() .newInstance()); - } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + } catch (Exception e) { throw new RuntimeException(e); } }); diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index a2b5c472eb..8b52707e32 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -67,9 +67,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.dreammaster.gthandler.CustomItemList; import cpw.mods.fml.common.registry.GameRegistry; @@ -80,7 +77,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; -import kubatech.Tags; import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; @@ -89,7 +85,6 @@ import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialA public class RecipeLoader { - private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[Recipe Loader]"); protected static final long bitsd = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.DISMANTLEABLE; @@ -158,21 +153,6 @@ public class RecipeLoader { } private static boolean registerMTE(ItemList item, Class<? extends MetaTileEntity> mte, String aName, - String aNameRegional) { - return registerMTE(item, mte, aName, aNameRegional, true); - } - - private static boolean registerMTE(ItemList item, Class<? extends MetaTileEntity> mte, String aName, - String aNameRegional, boolean... deps) { - boolean dep = true; - for (boolean i : deps) if (!i) { - dep = false; - break; - } - return registerMTE(item, mte, aName, aNameRegional, dep); - } - - private static boolean registerMTE(ItemList item, Class<? extends MetaTileEntity> mte, String aName, String aNameRegional, boolean dep) { if (MTEID > MTEIDMax) throw new RuntimeException("MTE ID's"); registerMTEUsingID(MTEID, item, mte, aName, aNameRegional, dep); diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index ae30b87988..2422ff0533 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -62,6 +62,7 @@ public class TCLoader { private static InfusionRecipe ultimateTeaRecipe = null; + @SuppressWarnings("unchecked") private static void registerRecipe() { if (ultimateTeaRecipe != null) return; final ItemStack[] components = new ItemStack[] { diff --git a/src/main/java/kubatech/loaders/item/ItemProxy.java b/src/main/java/kubatech/loaders/item/ItemProxy.java index a8d7124a65..4e37175cd7 100644 --- a/src/main/java/kubatech/loaders/item/ItemProxy.java +++ b/src/main/java/kubatech/loaders/item/ItemProxy.java @@ -66,16 +66,13 @@ public class ItemProxy { private final String unlocalizedName; private final String texturepath; private IIcon icon; - private int itemID; public ItemProxy(String unlocalizedName, String texture) { this.unlocalizedName = "kubaitem." + unlocalizedName; texturepath = Tags.MODID + ":" + texture; } - public void ItemInit(int index) { - itemID = index; - } + public void ItemInit(int index) {} public String getUnlocalizedName() { return unlocalizedName; diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java index 77d99d2ab4..02546dd258 100644 --- a/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java +++ b/src/main/java/kubatech/mixin/mixins/minecraft/LanguageRegistryMixin.java @@ -16,12 +16,12 @@ import cpw.mods.fml.relauncher.Side; public class LanguageRegistryMixin { @Inject(method = "loadLanguagesFor", at = @At(value = "HEAD"), remap = false, require = 1) - private void loadLanguagesForHEAD(ModContainer container, Side side, CallbackInfo callbackInfo) { + private void kubatech$loadLanguagesForHEAD(ModContainer container, Side side, CallbackInfo callbackInfo) { currentlyTranslating = container.getModId(); } @Inject(method = "loadLanguagesFor", at = @At(value = "RETURN"), remap = false, require = 1) - private void loadLanguagesForRETURN(ModContainer container, Side side, CallbackInfo callbackInfo) { + private void kubatech$loadLanguagesForRETURN(ModContainer container, Side side, CallbackInfo callbackInfo) { currentlyTranslating = null; } } diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java index e591878c32..e903a3e139 100644 --- a/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java +++ b/src/main/java/kubatech/mixin/mixins/minecraft/LocaleMixin.java @@ -25,7 +25,7 @@ public class LocaleMixin { target = "Lnet/minecraft/client/resources/IResourceManager;getAllResources(Lnet/minecraft/util/ResourceLocation;)Ljava/util/List;"), index = 0, require = 1) - private ResourceLocation loadLocaleDataFiles(ResourceLocation resourceLocation) { + private ResourceLocation kubatech$loadLocaleDataFiles(ResourceLocation resourceLocation) { currentlyTranslating = resourceLocation.getResourceDomain(); return resourceLocation; } @@ -37,7 +37,7 @@ public class LocaleMixin { target = "Ljava/util/regex/Matcher;replaceAll(Ljava/lang/String;)Ljava/lang/String;", remap = false), require = 1) - private String replaceAll(Matcher matcher, String replace) { + private String kubatech$replaceAll(Matcher matcher, String replace) { if (currentlyTranslating != null && currentlyTranslating.equals(Tags.MODID) && matcher.find()) { return matcher.replaceFirst(matcher.group()); } diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java index 2841ccc0c0..6a0bc4af62 100644 --- a/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java +++ b/src/main/java/kubatech/mixin/mixins/minecraft/StringTranslateMixin.java @@ -24,7 +24,7 @@ public class StringTranslateMixin { remap = false), remap = false, require = 1) - private static String replaceAll(Matcher matcher, String replace) { + private static String kubatech$replaceAll(Matcher matcher, String replace) { if (currentlyTranslating != null && currentlyTranslating.equals(Tags.MODID) && matcher.find()) { return matcher.replaceFirst(matcher.group()); } diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java index ed28dc60c4..42c71cadbd 100644 --- a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java +++ b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java @@ -6,7 +6,7 @@ import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import com.gtnewhorizon.mixinextras.injector.ModifyReturnValue; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; import kubatech.loaders.BlockLoader; @@ -16,7 +16,7 @@ public class WorldMixin { @SuppressWarnings("ConstantConditions") @ModifyReturnValue(method = "getBlock", at = @At("RETURN"), require = 1) - private Block getBlockDetector(Block block, int x, int y, int z) { + private Block kubatech$getBlockDetector(Block block, int x, int y, int z) { if (block == BlockLoader.kubaBlock) BlockLoader.kubaBlock.setLastBlockAccess((World) (Object) this, x, y, z); return block; } diff --git a/src/main/java/kubatech/nei/IMCForNEI.java b/src/main/java/kubatech/nei/IMCForNEI.java index 6a4419e9a0..2d59387911 100644 --- a/src/main/java/kubatech/nei/IMCForNEI.java +++ b/src/main/java/kubatech/nei/IMCForNEI.java @@ -23,7 +23,6 @@ package kubatech.nei; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.event.FMLInterModComms; -import kubatech.Tags; import kubatech.api.LoaderReference; public class IMCForNEI { @@ -32,35 +31,6 @@ public class IMCForNEI { if (LoaderReference.EnderIO) sendCatalyst("mobsinfo.mobhandler", "gregtech:gt.blockmachines:14201"); } - private static void sendHandler(String aName, String aBlock, int width, int height, int maxrecipesperpage, - int yshift) { - NBTTagCompound aNBT = new NBTTagCompound(); - aNBT.setString("handler", aName); - aNBT.setString("modName", Tags.MODNAME); - aNBT.setString("modId", Tags.MODID); - aNBT.setBoolean("modRequired", true); - aNBT.setString("itemName", aBlock); - aNBT.setInteger("handlerHeight", height); - aNBT.setInteger("handlerWidth", width); - aNBT.setInteger("maxRecipesPerPage", maxrecipesperpage); - aNBT.setInteger("yShift", yshift); - FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); - } - - private static void sendGTStyledHandler(String aName, String aBlock) { - NBTTagCompound aNBT = new NBTTagCompound(); - aNBT.setString("handler", aName); - aNBT.setString("modName", Tags.MODNAME); - aNBT.setString("modId", Tags.MODID); - aNBT.setBoolean("modRequired", true); - aNBT.setString("itemName", aBlock); - aNBT.setInteger("handlerHeight", 135); - aNBT.setInteger("handlerWidth", 166); - aNBT.setInteger("maxRecipesPerPage", 2); - aNBT.setInteger("yShift", 6); - FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); - } - private static void sendCatalyst(String aName, String aStack, int aPriority) { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handlerID", aName); diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java index ce311dfc3a..13660c573a 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java @@ -484,6 +484,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber private final WeaponCache weaponCache = new WeaponCache(); + @SuppressWarnings("unlikely-arg-type") @Override @NotNull public CheckRecipeResult checkProcessing() { @@ -520,7 +521,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes GT_MetaTileEntity_Hatch_InputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0); - if (inputbus != null && !isValidMetaTileEntity(inputbus)) inputbus = null; + if (inputbus != null && !inputbus.isValid()) inputbus = null; ItemStack lootingHolder = inputbus == null ? null : inputbus.getStackInSlot(0); weaponCheck: { // noinspection EqualsBetweenInconvertibleTypes diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java index 2e916e29e0..164ba7e7ba 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java @@ -459,7 +459,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse int watercheck = waterusage; FluidStack waterStack = new FluidStack(FluidRegistry.WATER, 1); for (GT_MetaTileEntity_Hatch_Input i : fluids) { - if (!isValidMetaTileEntity(i)) continue; + if (!i.isValid()) continue; if (i instanceof GT_MetaTileEntity_Hatch_MultiInput) { int amount = ((GT_MetaTileEntity_Hatch_MultiInput) i).getFluidAmount(waterStack); if (amount == 0) continue; @@ -1667,6 +1667,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse private static class GreenHouseRandom extends Random { + private static final long serialVersionUID = -387271808935248890L; + @Override public int nextInt(int bound) { return 0; |