diff options
author | Technus <daniel112092@gmail.com> | 2017-07-22 15:15:48 +0200 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-07-22 15:15:48 +0200 |
commit | f3af1d348943d83c16672ea8111f840484fc8f81 (patch) | |
tree | 29c336197521594ed48d76ec7ca2897e9d79e569 /src/main | |
parent | ab3c3189b1bad0804e1a1766a6d17f248767cd71 (diff) | |
download | GT5-Unofficial-f3af1d348943d83c16672ea8111f840484fc8f81.tar.gz GT5-Unofficial-f3af1d348943d83c16672ea8111f840484fc8f81.tar.bz2 GT5-Unofficial-f3af1d348943d83c16672ea8111f840484fc8f81.zip |
no message
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/github/technus/tectech/loader/MachineLoader.java | 2 | ||||
-rw-r--r-- | src/main/java/com/github/technus/tectech/thing/CustomItemList.java | 1 | ||||
-rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java (renamed from src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_microwave.java) | 14 | ||||
-rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo | 2 |
4 files changed, 6 insertions, 13 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java index cd2eea6cca..6b37db2cee 100644 --- a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java @@ -182,7 +182,7 @@ public class MachineLoader implements Runnable { Machine_Multi_Switch.set(new GT_MetaTileEntity_EM_switch(15310, "multimachine.em.switch", "Network Switch With QoS").getStackForm(1L)); Machine_Multi_Computer.set(new GT_MetaTileEntity_EM_computer(15311, "multimachine.em.computer", "Quantum Computer").getStackForm(1L)); - Machine_Multi_Microwave.set(new GT_MetaTileEntity_EM_microwave(15312, "multimachine.tm.microwave", "Microwave Grinder").getStackForm(1L)); + Machine_Multi_Microwave.set(new GT_MetaTileEntity_TM_microwave(15312, "multimachine.tm.microwave", "Microwave Grinder").getStackForm(1L)); Machine_Multi_EMjunction.set(new GT_MetaTileEntity_EM_junction(15320, "multimachine.em.junction", "Matter Junction").getStackForm(1L)); Machine_Multi_MatterToEM.set(new GT_MetaTileEntity_EM_quantizer(15321, "multimachine.em.mattertoem", "Matter Quantizer").getStackForm(1L)); diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index d69789950f..d00e97ca36 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -1,6 +1,5 @@ package com.github.technus.tectech.thing; -import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_microwave; import gregtech.api.interfaces.IItemContainer; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 0f23322bf3..ba35db7a34 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -1,8 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import gregtech.GT_Mod; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -20,17 +18,13 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; -import static gregtech.api.GregTech_API.sBlockCasings1; import static gregtech.api.GregTech_API.sBlockCasings4; /** * Created by danie_000 on 17.12.2016. */ -public class GT_MetaTileEntity_EM_microwave extends GT_MetaTileEntity_MultiblockBase_EM { +public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_MultiblockBase_EM { private int powerSetting = 1000; private int timerSetting = 0; private int timerValue = 0,timerValueBackup=0; @@ -53,16 +47,16 @@ public class GT_MetaTileEntity_EM_microwave extends GT_MetaTileEntity_Multiblock private static final byte[] blockMetaFallback = new byte[]{1}; //endregion - public GT_MetaTileEntity_EM_microwave(int aID, String aName, String aNameRegional) { + public GT_MetaTileEntity_TM_microwave(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MetaTileEntity_EM_microwave(String aName) { + public GT_MetaTileEntity_TM_microwave(String aName) { super(aName); } public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_EM_microwave(this.mName); + return new GT_MetaTileEntity_TM_microwave(this.mName); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo index f59c71bbbd..ba2a8d2062 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo @@ -1,4 +1,3 @@ -microwave grinder forcefields colorizer -> aka colorable 'bloodmoon' in a box HAARP, holograms? gravity wells/entity accelerators @@ -15,6 +14,7 @@ design reader station - singleblock quantum dislocator - to move GT tiles? GT infusion altar +magic matter compounds Fucking regular multiblock container for EM... - hightier - with selection of what u want |