From 069eee6fa0c980f8f38ebcc31474c669f323e647 Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 11 Sep 2017 07:03:12 +0200 Subject: make microwave use able without parameters --- src/main/java/com/github/technus/tectech/TecTech.java | 9 ++------- .../metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 6 +++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index c5e47ed068..3f8f0549c0 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -44,7 +44,6 @@ public class TecTech { public static TecTechConfig ModConfig; public static XSTR Rnd = null; public static CreativeTabs mainTab = null; - private static boolean oneTimeFix = false; public static boolean hasCOFH = false, hasThaumcraft = false; @@ -92,6 +91,8 @@ public class TecTech { @EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { GTCustomLoader.postLoad(); + if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes(); + fixBlocks(); } @EventHandler @@ -100,11 +101,6 @@ public class TecTech { @EventHandler public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { - if (!oneTimeFix) { - oneTimeFix = true; - if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes(); - fixBlocks(); - } } private void FixBrokenFusionRecipes() { @@ -151,7 +147,6 @@ public class TecTech { "GalacticraftMars", "GalaxySpace", "extracells", - "ExtraUtilities", "Avaritia", "avaritiaddons", "EnderStorage", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 74db6b70e3..706b367046 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -35,7 +35,7 @@ import static gregtech.api.GregTech_API.sBlockCasings4; */ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { private int powerSetting = 1000; - private int timerSetting = 0; + private int timerSetting = 360; private int timerValue = 0; private boolean hasBeenPausedThiscycle=false; private boolean flipped=false; @@ -72,10 +72,14 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock public GT_MetaTileEntity_TM_microwave(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); + eParamsIn[0] =powerSetting; + eParamsIn[10]=timerSetting; } public GT_MetaTileEntity_TM_microwave(String aName) { super(aName); + eParamsIn[0] =powerSetting; + eParamsIn[10]=timerSetting; } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { -- cgit From 8334c42a5818cd279d0a2ac7105c6f18192ae64f Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 15 Sep 2017 17:21:47 +0200 Subject: Fix typo --- .../metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 706b367046..8360b09708 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -37,7 +37,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock private int powerSetting = 1000; private int timerSetting = 360; private int timerValue = 0; - private boolean hasBeenPausedThiscycle=false; + private boolean hasBeenPausedThisCycle =false; private boolean flipped=false; //region Structure @@ -158,7 +158,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public boolean checkRecipe_EM(ItemStack itemStack) { - hasBeenPausedThiscycle=false; + hasBeenPausedThisCycle =false; if(powerSetting<=300 || eParamsInStatus[0] == PARAM_TOO_HIGH || timerSetting<=0 || timerSetting>3000) return false; if (timerValue <= 0) { timerValue=timerSetting; @@ -172,7 +172,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public void outputAfterRecipe_EM() { - if(hasBeenPausedThiscycle) return;//skip timer and actions if paused + if(hasBeenPausedThisCycle) return;//skip timer and actions if paused timerValue--; IGregTechTileEntity mte=getBaseMetaTileEntity(); int xDirShift = ForgeDirection.getOrientation(mte.getBackFacing()).offsetX*2; @@ -264,8 +264,8 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock @Override public boolean onRunningTick(ItemStack aStack) { - if(eSafeVoid) hasBeenPausedThiscycle=true; - return hasBeenPausedThiscycle || super.onRunningTick(aStack);//consume eu and other resources if not paused + if(eSafeVoid) hasBeenPausedThisCycle =true; + return hasBeenPausedThisCycle || super.onRunningTick(aStack);//consume eu and other resources if not paused } @Override -- cgit