diff options
7 files changed, 43 insertions, 18 deletions
diff --git a/build.gradle b/build.gradle index 6aa5cd6edf..81bf88b5c1 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ sourceCompatibility = 1.7 targetCompatibility = 1.7 archivesBaseName = "GT++" -version = "1.4.3.4-Experimental" +version = "1.4.3.5-Experimental" minecraft.version = "1.7.10-10.13.4.1448-1.7.10" task sourceJar(type: Jar) { diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index efb395d0f4..93ab19f731 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -44,6 +44,8 @@ implements ActionListener CORE.DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)"); CORE.disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration."); CORE.disableStaballoyBlastFurnaceRecipe = config.getBoolean("disableStaballoyBlastFurnaceRecipe", "debug", false, "Disables Staballoy Blast Furnace Recipe."); + CORE.disableCentrifugeFormation = config.getBoolean("disableCentrifuge", "debug", true, "Keeps the Items around, just stops the multiblock forming. (It's broken currently, needs in depth testing)"); + CORE.enableSolarGenerators = config.getBoolean("enableSolarGenerators", "machines", false, "These may be overpowered, Consult a local electrician."); config.save(); } diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java index 09e27a80d7..5f6def23cf 100644 --- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java +++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java @@ -1,5 +1,8 @@ package miscutil.core.handler.registration.gregtech; +import miscutil.core.lib.CORE; +import miscutil.core.lib.LoadedMods; +import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.enums.GregtechItemList; import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntitySolarGenerator; @@ -7,9 +10,9 @@ public class GregtechSolarGenerators { public static void run() { - if (miscutil.core.lib.LoadedMods.Gregtech){ - //Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Solar Generator Blocks."); - //run1(); + if (LoadedMods.Gregtech && CORE.enableSolarGenerators){ + Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Solar Generator Blocks."); + run1(); } } diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index c2909c2709..425f51be5d 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -17,7 +17,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.4.3.2"; + public static final String VERSION = "1.4.3.5"; public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; @@ -36,6 +36,8 @@ public class CORE { public static boolean disableEnderIOIntegration = false; public static boolean disableStaballoyBlastFurnaceRecipe = false; + public static boolean disableCentrifugeFormation = true; + public static boolean enableSolarGenerators = false; /** * A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items. diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java index 42a1cf4bc0..177769092d 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java @@ -20,14 +20,17 @@ import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine; import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; public class GregtechMetaTileEntityIndustrialCentrifuge extends GregtechMeta_MultiBlockBase { private static boolean controller; + private static boolean isDisabled = false; private static ITexture frontFace; private static ITexture frontFaceActive; private static Textures.BlockIcons.CustomIcon GT9_5_Active = new Textures.BlockIcons.CustomIcon("iconsets/LARGETURBINE_ST_ACTIVE5"); @@ -102,6 +105,7 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkRecipe(ItemStack aStack) { ArrayList<ItemStack> tInputList = getStoredInputs(); + Utils.LOG_WARNING("Stored Input Items: "+tInputList.size()); for (int i = 0; i < tInputList.size() - 1; i++) { for (int j = i + 1; j < tInputList.size(); j++) { if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) { @@ -117,12 +121,15 @@ extends GregtechMeta_MultiBlockBase { ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2); ArrayList<FluidStack> tFluidList = getStoredFluids(); + Utils.LOG_WARNING("Stored Input Fluids: "+tFluidList.size()); for (int i = 0; i < tFluidList.size() - 1; i++) { for (int j = i + 1; j < tFluidList.size(); j++) { if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) { if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) { + Utils.LOG_WARNING("Removing j from tFluidList"); tFluidList.remove(j--); } else { + Utils.LOG_WARNING("Removing i from tFluidList"); tFluidList.remove(i--); break; } @@ -130,11 +137,13 @@ extends GregtechMeta_MultiBlockBase { } } FluidStack[] tFluids = (FluidStack[]) Arrays.copyOfRange(tFluidList.toArray(new FluidStack[tInputList.size()]), 0, 1); - if (tInputList.size() > 0) { + Utils.LOG_WARNING("Size:"+tInputList.size()); + if (tInputList.size() > 0 || tFluidList.size() > 0) { + Utils.LOG_WARNING("Input size > 0"); long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs); - if ((tRecipe != null) && (3 >= tRecipe.mSpecialValue) && (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) { + if ((tRecipe != null) && (0 >= tRecipe.mSpecialValue) && (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; if (tRecipe.mEUt <= 16) { @@ -155,11 +164,11 @@ extends GregtechMeta_MultiBlockBase { this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)}; this.mOutputFluids = new FluidStack[]{tRecipe.getFluidOutput(0)}; updateSlots(); - Utils.LOG_INFO("Centrifuge: True"); + Utils.LOG_WARNING("Centrifuge: True"); return true; } } - Utils.LOG_INFO("Centrifuge: False"); + Utils.LOG_WARNING("Centrifuge: False"); return false; } @@ -180,6 +189,13 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + if (CORE.disableCentrifugeFormation){ + EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(this.getBaseMetaTileEntity().getOwnerName()); + if (!player.getEntityWorld().isRemote && isDisabled == false) + Utils.messagePlayer(player, "This Multiblock is disabled via the config. [Only re-enable if you're bugtesting.]"); + isDisabled = true; + return false; + } int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; @@ -194,14 +210,14 @@ extends GregtechMeta_MultiBlockBase { if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - //Utils.LOG_INFO("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord()); + //Utils.LOG_WARNING("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord()); if ((!addMaintenanceToMachineList(tTileEntity, 57)) && (!addInputToMachineList(tTileEntity, 57)) && (!addOutputToMachineList(tTileEntity, 57)) && (!addEnergyInputToMachineList(tTileEntity, 57))) { //Maintenance Hatch if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { if (tTileEntity.getXCoord() == aBaseMetaTileEntity.getXCoord() && tTileEntity.getYCoord() == aBaseMetaTileEntity.getYCoord() && tTileEntity.getZCoord() == (aBaseMetaTileEntity.getZCoord()+2)) { if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) { - Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE"); + Utils.LOG_WARNING("MAINT HATCH IN CORRECT PLACE"); this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity()); ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex(); } else { @@ -209,7 +225,7 @@ extends GregtechMeta_MultiBlockBase { } } else { - Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE"); + Utils.LOG_WARNING("MAINT HATCH IN WRONG PLACE"); } } diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang index f10c0298d9..e7f09d3d9a 100644 --- a/src/resources/assets/miscutils/lang/en_US.lang +++ b/src/resources/assets/miscutils/lang/en_US.lang @@ -1,8 +1,10 @@ -itemGroup.MiscUtilBlockTab=[MU] Blocks -itemGroup.MiscUtilMiscTab=[MU] Items -itemGroup.MiscUtilCombatTab=[MU] Combat -itemGroup.MiscUtilToolsTab=[MU] Tools -itemGroup.MiscUtilMachineTab=[MU] Machines +itemGroup.MiscUtilBlockTab=[GT++] Blocks +itemGroup.MiscUtilMiscTab=[GT++] Items +itemGroup.MiscUtilCombatTab=[GT++] Combat +itemGroup.MiscUtilToolsTab=[GT++] Tools +itemGroup.MiscUtilMachineTab=[GT++] Machines + +item.itemPLACEHOLDER_Circuit.name=Quark Manipulator (UV) diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 59e0914184..1579e36589 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)", "credits": "", "logoFile": "", - "version": "1.4.3.2", + "version": "1.4.3.5", "mcversion": "1.7.10", "url": "https://github.com/draknyte1/MiscUtilities/wiki", "updateUrl": "https://github.com/draknyte1/MiscUtilities/tree/master/build/libs", |