aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-09-11 07:03:12 +0200
committerTechnus <daniel112092@gmail.com>2017-09-18 06:22:28 +0200
commit069eee6fa0c980f8f38ebcc31474c669f323e647 (patch)
tree596266a6a6ae74ec516227e546de2e2db4c38dd4 /src/main
parenta02e0b088c44694cc3b144da207657ff1fd60efc (diff)
downloadGT5-Unofficial-069eee6fa0c980f8f38ebcc31474c669f323e647.tar.gz
GT5-Unofficial-069eee6fa0c980f8f38ebcc31474c669f323e647.tar.bz2
GT5-Unofficial-069eee6fa0c980f8f38ebcc31474c669f323e647.zip
make microwave use able without parameters
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/TecTech.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java6
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) {