diff options
Diffstat (limited to 'src/main/java/com')
35 files changed, 552 insertions, 83 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index a2879c16d8..f1be2a0c10 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -2,11 +2,11 @@ package com.github.technus.tectech; import com.github.technus.tectech.auxiliary.Reference; import com.github.technus.tectech.auxiliary.TecTechConfig; -import com.github.technus.tectech.loader.GT_CustomLoader; +import com.github.technus.tectech.loader.Main; import com.github.technus.tectech.proxy.CommonProxy; import com.github.technus.tectech.thing.block.QuantumGlass; import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; -import com.github.technus.tectech.thing.item.debug_container_EM; +import com.github.technus.tectech.thing.item.DebugContainer_EM; import com.github.technus.tectech.thing.machineTT; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -40,7 +40,7 @@ public class TecTech { public static LogHelper Logger = new LogHelper(Reference.MODID); private static IngameErrorLog Module_AdminErrorLogs = null; - public static GT_CustomLoader GTCustomLoader = null; + public static Main GTCustomLoader = null; public static TecTechConfig ModConfig; public static XSTR Rnd = null; public static CreativeTabs mainTab = null; @@ -78,9 +78,9 @@ public class TecTech { hasCOFH=Loader.isModLoaded(Reference.COFHCORE); QuantumGlass.run(); - debug_container_EM.run(); + DebugContainer_EM.run(); - GTCustomLoader = new GT_CustomLoader(); + GTCustomLoader = new Main(); GTCustomLoader.run(); GTCustomLoader.run2(); @@ -88,7 +88,7 @@ public class TecTech { @SideOnly(Side.CLIENT) @Override public Item getTabIconItem() { - return debug_container_EM.INSTANCE; + return DebugContainer_EM.INSTANCE; } @Override @@ -109,7 +109,7 @@ public class TecTech { public void RegisterThingsInTabs() { QuantumGlass.INSTANCE.setCreativeTab(mainTab); GT_Container_CasingsTT.sBlockCasingsTT.setCreativeTab(mainTab); - debug_container_EM.INSTANCE.setCreativeTab(mainTab); + DebugContainer_EM.INSTANCE.setCreativeTab(mainTab); } /** diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java index 05594ce1d5..313106f64b 100644 --- a/src/main/java/com/github/technus/tectech/Util.java +++ b/src/main/java/com/github/technus/tectech/Util.java @@ -5,10 +5,17 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + /** * Created by Tec on 21.03.2017. */ @@ -40,7 +47,7 @@ public class Util { byte facing = aBaseMetaTileEntity.getFrontFacing(); World world=aBaseMetaTileEntity.getWorld(); - int x, y, z, a, b, c,yPos; + int x, y, z, a, b, c, yPos; //a,b,c - relative to block face! //x,y,z - relative to block position on map! //yPos - absolute height of checked block @@ -66,33 +73,37 @@ public class Util { case 0: x = -a; y = +c; z = -b; break;//similar to 2 default: return false; } - //that must be here since in some cases other axis (a,b,c) controls y + //that must be here since in some cases other axis (b,c) controls y yPos=aBaseMetaTileEntity.getYCoord()+y; if(yPos<0 || yPos>=256) return false; + //Check block - if (forceCheck||world.blockExists(x,y,z)) + if (world.blockExists(x,y,z)) {//this actually checks if the chunk is loaded at this pos switch (block) { case '-'://must be air - if (!aBaseMetaTileEntity.getAirOffset(x, y, z)) return false; + if (getBlockOffset(aBaseMetaTileEntity, x, y, z, world).getMaterial() != Material.air) + return false; break; case '+'://must not be air - if (aBaseMetaTileEntity.getAirOffset(x, y, z)) return false; + if (getBlockOffset(aBaseMetaTileEntity, x, y, z, world).getMaterial() == Material.air) + return false; break; default: {//check for block (countable) int pointer = block - '0'; //countable air -> net.minecraft.block.BlockAir - if (aBaseMetaTileEntity.getBlockOffset(x, y, z) != blockType[pointer]) { + if (getBlockOffset(aBaseMetaTileEntity,x,y,z,world) != blockType[pointer]) { if (TecTech.ModConfig.DEBUG_MODE) - TecTech.Logger.info("Struct-block-error " + x + " " + y + " " + z + "/" + a + " " + c + "/" + aBaseMetaTileEntity.getBlockOffset(x, y, z) + " " + blockType[pointer]); + TecTech.Logger.info("Struct-block-error " + x + " " + y + " " + z + "/" + a + " " + c + "/" + getBlockOffset(aBaseMetaTileEntity,x,y,z,world) + " " + blockType[pointer]); return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != blockMeta[pointer]) { + if (getMetaIDOffset(aBaseMetaTileEntity,x,y,z,world) != blockMeta[pointer]) { if (TecTech.ModConfig.DEBUG_MODE) - TecTech.Logger.info("Struct-meta-id-error " + x + " " + y + " " + z + "/" + a + " " + c + "/" + aBaseMetaTileEntity.getMetaIDOffset(x, y, z) + " " + blockMeta[pointer]); + TecTech.Logger.info("Struct-meta-id-error " + x + " " + y + " " + z + "/" + a + " " + c + "/" + getMetaIDOffset(aBaseMetaTileEntity,x,y,z,world) + " " + blockMeta[pointer]); return false; } } } + }else if (forceCheck) return false; a++;//block in horizontal layer } } @@ -103,6 +114,141 @@ public class Util { return true; } + public static String[] ReverseStructureCheck(IGregTechTileEntity aBaseMetaTileEntity, + int horizontalOffset, int verticalOffset, int depthOffset, + int horizontalSize, int verticalSize, int depthSize){ + //TE Rotation + byte facing = aBaseMetaTileEntity.getFrontFacing(); + World world=aBaseMetaTileEntity.getWorld(); + + ItemStack[] array=new ItemStack[10]; + + int x, y, z, a, b, c,yPos; + //a,b,c - relative to block face! + //x,y,z - relative to block position on map! + //yPos - absolute height of checked block + + //perform your duties - #1 - count block types + c = -depthOffset; + for (int cz=0;cz<depthSize;cz++) {//front to back + b = verticalOffset; + for (int by=0;by<verticalSize;by++) {//top to bottom + a = -horizontalOffset; + for (int az=0;az<horizontalSize;az++) {//left to right + //get x y z from rotation + switch (facing) {//translation + case 4: x = +c; z = +a; y = +b; break; + case 3: x = +a; z = -c; y = +b; break; + case 5: x = -c; z = -a; y = +b; break; + case 2: x = -a; z = +c; y = +b; break; + //Things get odd if the block faces up or down... + case 1: x = +a; y = -c; z = +b; break;//similar to 3 + case 0: x = -a; y = +c; z = -b; break;//similar to 2 + default: return new String[]{"Invalid facing"}; + } + //that must be here since in some cases other axis (a,b,c) controls y + yPos=aBaseMetaTileEntity.getYCoord()+y; + if(yPos<0 || yPos>=256) return new String[]{"Invalid position"}; + //Check block + Block block=getBlockOffset(aBaseMetaTileEntity,x,y,z,world); + int meta=getMetaIDOffset(aBaseMetaTileEntity,x,y,z,world); + + if(!block.hasTileEntity(meta) && block.getMaterial()!=Material.air) { + boolean err=true; + final ItemStack is=new ItemStack(block, 1, meta); + for(int i=0;i<array.length;i++){ + if(array[i]==null){ + array[i]=is; + err=false; + break; + } else if(is.getItem()==array[i].getItem() && is.getItemDamage()==array[i].getItemDamage()){ + err=false; + break; + } + } + if (err) return new String[]{"Too much different blocks"}; + } + + a++;//block in horizontal layer + } + b--;//horizontal layer + } + c++;//depth + } + + List<String> output=new ArrayList<>(); + + output.add("Block[] MetaID[]"); + output.add(""); + for(ItemStack is:array){ + if(is!=null) output.add(is.getUnlocalizedName()+" "+is.getItemDamage()); + } + output.add(""); + output.add("String[][]"); + //perform your duties - #2 - write strings + c = -depthOffset; + for (int cz=0;cz<depthSize;cz++) {//front to back + b = verticalOffset; + output.add(""); + for (int by=0;by<verticalSize;by++) {//top to bottom + a = -horizontalOffset; + String line=""; + for (int az=0;az<horizontalSize;az++) {//left to right + //get x y z from rotation + switch (facing) {//translation + case 4: x = +c; z = +a; y = +b; break; + case 3: x = +a; z = -c; y = +b; break; + case 5: x = -c; z = -a; y = +b; break; + case 2: x = -a; z = +c; y = +b; break; + //Things get odd if the block faces up or down... + case 1: x = +a; y = -c; z = +b; break;//similar to 3 + case 0: x = -a; y = +c; z = -b; break;//similar to 2 + default: return new String[]{"Invalid facing"}; + } + //that must be here since in some cases other axis (a,b,c) controls y + //yPos=aBaseMetaTileEntity.getYCoord()+y; + //if(yPos<0 || yPos>=256) return new String[]{"Invalid position"}; + //Check block + + Block block=getBlockOffset(aBaseMetaTileEntity,x,y,z,world); + int meta=getMetaIDOffset(aBaseMetaTileEntity,x,y,z,world); + + if(a==0 && b==0 && c==0){ + line+='X'; + }else if(block.getMaterial()==Material.air){ + line+='-'; + }else if(block.hasTileEntity(meta)){ + line+='+'; + }else{ + ItemStack stack=new ItemStack(block,1,meta); + String str="?"; + for(int i=0;i<array.length;i++){ + if(array[i]!=null && stack.getItem()==array[i].getItem() && stack.getItemDamage()==array[i].getItemDamage()) { + str = Integer.toString(i); + break; + } + } + line+=str; + } + + a++;//block in horizontal layer + } + output.add(line); + b--;//horizontal layer + } + c++;//depth + } + return output.toArray(new String[0]); + } + + private static Block getBlockOffset(IGregTechTileEntity a,int x,int y,int z,World w){ + return w.getBlock(a.getXCoord()+x,a.getYCoord()+y,a.getZCoord()+z); + } + + private static int getMetaIDOffset(IGregTechTileEntity a,int x,int y,int z,World w){ + return w.getBlockMetadata(a.getXCoord()+x,a.getYCoord()+y,a.getZCoord()+z); + } + public static boolean isInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] requiredFluidInputs, ItemStack[] requiredInputs, FluidStack[] givenFluidInputs, ItemStack... givenInputs) { if (!GregTech_API.sPostloadFinished) return false; if (requiredFluidInputs.length > 0 && givenFluidInputs == null) return false; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java b/src/main/java/com/github/technus/tectech/elementalMatter/CommonValues.java index c18c543ee5..d16b1fd18c 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/commonValues.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/CommonValues.java @@ -5,7 +5,7 @@ import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 11.01.2017. */ -public final class commonValues { +public final class CommonValues { public final static String tecMark = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + diff --git a/src/main/java/com/github/technus/tectech/loader/GT_Loader_Machines.java b/src/main/java/com/github/technus/tectech/loader/Machines.java index 02cab21bce..64110a69bf 100644 --- a/src/main/java/com/github/technus/tectech/loader/GT_Loader_Machines.java +++ b/src/main/java/com/github/technus/tectech/loader/Machines.java @@ -1,16 +1,18 @@ package com.github.technus.tectech.loader; +import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.metaTileEntity.hatch.*; import com.github.technus.tectech.thing.metaTileEntity.multi.*; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugStructureWriter; import static com.github.technus.tectech.thing.CustomItemList.*; /** * Created by danie_000 on 16.11.2016. */ -public class GT_Loader_Machines implements Runnable { +public class Machines implements Runnable { public void run() { // =================================================================================================== // eM IN @@ -190,6 +192,8 @@ public class GT_Loader_Machines implements Runnable { Machine_Multi_Computer.set(new GT_MetaTileEntity_EM_computer(12172, "multimachine.em.computer", "Quantum Computer").getStackForm(1L)); Machine_Multi_Switch.set(new GT_MetaTileEntity_EM_switch(12173, "multimachine.em.switch", "Network Switch With QoS").getStackForm(1L)); + Machine_DebugWriter.set(new GT_MetaTileEntity_DebugStructureWriter(12179,"debug.tt.writer","Debug Structure Writer",15).getStackForm(1L)); + // =================================================================================================== // Hatches EM // =================================================================================================== diff --git a/src/main/java/com/github/technus/tectech/loader/GT_CustomLoader.java b/src/main/java/com/github/technus/tectech/loader/Main.java index deec6e4306..6a88c06176 100644 --- a/src/main/java/com/github/technus/tectech/loader/GT_CustomLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/Main.java @@ -3,25 +3,25 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.thing.casing.GT_Loader_CasingsTT; -public class GT_CustomLoader { - private GT_Loader_Machines ElementalLoader; +public class Main { + private Machines ElementalLoader; private GT_Loader_CasingsTT ElementalCasing; - private GT_Loader_Recipes ElementalRecipes; + private Recipes ElementalRecipes; - public GT_CustomLoader() { + public Main() { } public void run() { ElementalCasing = new GT_Loader_CasingsTT(); ElementalCasing.run(); TecTech.Logger.info("Casing Init Done"); - ElementalLoader = new GT_Loader_Machines(); + ElementalLoader = new Machines(); ElementalLoader.run(); TecTech.Logger.info("Machine Init Done"); } public void run2() { - ElementalRecipes = new GT_Loader_Recipes(); + ElementalRecipes = new Recipes(); ElementalRecipes.run(); TecTech.Logger.info("Recipe Init Done"); } diff --git a/src/main/java/com/github/technus/tectech/loader/GT_Loader_Recipes.java b/src/main/java/com/github/technus/tectech/loader/Recipes.java index d4c76198d2..8a1a5da6f7 100644 --- a/src/main/java/com/github/technus/tectech/loader/GT_Loader_Recipes.java +++ b/src/main/java/com/github/technus/tectech/loader/Recipes.java @@ -7,7 +7,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_E /** * Created by danie_000 on 16.11.2016. */ -public class GT_Loader_Recipes implements Runnable { +public class Recipes implements Runnable { public void run() { // =================================================================================================== // def init 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 a64f219f59..525fcbd7e3 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack; import static gregtech.api.enums.GT_Values.W; public enum CustomItemList implements IItemContainer { + Machine_DebugWriter, EMpipe,DATApipe, eM_dynamomulti4_UV, eM_dynamomulti16_UV, eM_dynamomulti64_UV, eM_dynamomulti4_UHV, eM_dynamomulti16_UHV, eM_dynamomulti64_UHV, diff --git a/src/main/java/com/github/technus/tectech/thing/item/debug_container_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java index 01e55898b5..6af497f3c9 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/debug_container_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java @@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree; import com.github.technus.tectech.elementalMatter.classes.tElementalException; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.elementalMatter.interfaces.iElementalInstanceContainer; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -25,10 +25,10 @@ import static com.github.technus.tectech.auxiliary.Reference.MODID; /** * Created by Tec on 15.03.2017. */ -public class debug_container_EM extends Item { - public static debug_container_EM INSTANCE; +public class DebugContainer_EM extends Item { + public static DebugContainer_EM INSTANCE; - debug_container_EM(){ + DebugContainer_EM(){ super(); setMaxStackSize(1); setUnlocalizedName("em.debugContainer"); @@ -70,7 +70,7 @@ public class debug_container_EM extends Item { @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { - aList.add(commonValues.tecMark); + aList.add(CommonValues.tecMark); try { NBTTagCompound tNBT = aStack.getTagCompound(); if (tNBT!=null && tNBT.hasKey("info")) { @@ -83,7 +83,7 @@ public class debug_container_EM extends Item { } public static void run(){ - INSTANCE=new debug_container_EM(); + INSTANCE=new DebugContainer_EM(); GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName()); } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index f03e981218..f8b9e46601 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import com.github.technus.tectech.thing.metaTileEntity.pipe.iConnectsToDataPipe; import gregtech.api.enums.Dyes; @@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; -import static com.github.technus.tectech.elementalMatter.commonValues.moveAt; +import static com.github.technus.tectech.elementalMatter.CommonValues.moveAt; import static gregtech.api.enums.Dyes.MACHINE_METAL; /** @@ -143,7 +143,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector extends GT_MetaTileE @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription, "High speed fibre optics connector.", EnumChatFormatting.AQUA + "Must be painted to work" diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java index d2d2cf0866..c3a8c38a2f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -106,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription //"Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java index 212d14586e..6d3347c182 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java @@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree; import com.github.technus.tectech.elementalMatter.classes.tElementalException; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.elementalMatter.interfaces.iElementalInstanceContainer; import com.github.technus.tectech.thing.machineTT; import com.github.technus.tectech.thing.metaTileEntity.pipe.iConnectsToEMpipe; @@ -20,7 +20,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; -import static com.github.technus.tectech.elementalMatter.commonValues.*; +import static com.github.technus.tectech.elementalMatter.CommonValues.*; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity; @@ -223,7 +223,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription, "Max stacks amount: " + EnumChatFormatting.AQUA + getMaxStacksCount(), "Stack capacity: " + EnumChatFormatting.AQUA + getMaxStackSize(), diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index ec14fddcbd..87fdd24f3f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -107,7 +107,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription, "Amperes In: " + EnumChatFormatting.AQUA + maxAmperesIn() + " A" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java index 53d81d3bee..7b0149f910 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java @@ -1,7 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; @@ -17,7 +17,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.EnumSkyBlock; -import static com.github.technus.tectech.elementalMatter.commonValues.disperseAt; +import static com.github.technus.tectech.elementalMatter.CommonValues.disperseAt; import static gregtech.api.enums.Dyes.MACHINE_METAL; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity; @@ -70,7 +70,7 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription, "Mass capacity: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c^2", "Disposal Speed: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c^2)/s", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index d33e47627a..c1f4471ba7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Param; import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Param; @@ -175,7 +175,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription, EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "E=M*C^2" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index 180bc5930a..107d61ef85 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -1,7 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Uncertainty; import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Uncertainty; @@ -166,7 +166,7 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, mDescription, EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Schrödinger equation in a box" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index f2f7d5ebe1..f33406819d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.block.QuantumGlass; import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; import gregtech.api.enums.Textures; @@ -86,7 +86,7 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Singularity based power generation.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Super unstable!!!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java index 918c2041d6..a539be1824 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -65,7 +65,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Collide matter at extreme velocities.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Faster than light!!!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index df0c333dea..0e7ebe8bd7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -55,7 +55,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, Util.intToString(TecTech.Rnd.nextInt(),8), EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "You need it to process the number above" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java index ea354a38d8..e47c2aab3b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafter.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.block.Block; @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_EM_crafter extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "The most precise way of making stuff.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "(Trans-Planck process)" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index ea1e49575d..34e02160a1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.block.QuantumGlass; import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -57,7 +57,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Transform quantum form back to...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "regular one, but why?" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 2c52d1a98d..6d2d0e9ab6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; import cofh.api.energy.IEnergyContainerItem; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import ic2.api.item.ElectricItem; @@ -124,7 +124,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Power Transfer Extreme!", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Insanely fast charging!", EnumChatFormatting.BLUE + "Doesn't work while broken!", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index 46ad5f74f2..5ad1b54d46 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.block.QuantumGlass; import com.github.technus.tectech.thing.casing.GT_Container_CasingsTT; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental; @@ -60,7 +60,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Reroutes Matter", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Axis aligned movement!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java index 98a67f5c2d..55bc1f5953 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.block.Block; @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Processing quantum matter since...", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "the time u started using it." }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index ecfc1dc2a9..4e853181fc 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -5,7 +5,7 @@ import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionSt import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree; import com.github.technus.tectech.elementalMatter.classes.tElementalException; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition; import com.github.technus.tectech.elementalMatter.definitions.dHadronDefinition; import com.github.technus.tectech.elementalMatter.definitions.eLeptonDefinition; @@ -80,7 +80,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Conveniently convert regular stuff into quantum form.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "To make it more inconvenient." }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index daa0894539..8d79a0bf8a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.block.Block; @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "What is existing here?", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "I HAVE NO IDEA (yet)!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java index 36f7eea344..8cf9473ce1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.block.Block; @@ -42,7 +42,7 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Alters time to stabilize matter", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Wibbly wobbly timey wimey, stuff." }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index ea38a216c0..b23a427e3f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -53,7 +53,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "User controller computation power routing", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Quality of service is a must" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index f5e15c088d..ee735ade16 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.item.ItemStack; @@ -65,7 +65,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Power substation", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "All the transformation!", EnumChatFormatting.BLUE + "Only 0.78125% power loss, HAYO!", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java index f332a65de4..165e128c3c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.multi; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -65,7 +65,7 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "It is not full of worms.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "It is full of anti-worms!!!" }; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java index 8baa6dfba2..4e1d01e704 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_MultiblockBase_EM.java @@ -5,7 +5,7 @@ import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionSt import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStack; import com.github.technus.tectech.elementalMatter.classes.cElementalInstanceStackTree; import com.github.technus.tectech.elementalMatter.classes.tElementalException; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import com.github.technus.tectech.thing.metaTileEntity.hatch.*; import com.github.technus.tectech.thing.metaTileEntity.multi.gui.GT_Container_MultiMachineEM; @@ -32,7 +32,7 @@ import net.minecraftforge.fluids.FluidStack; import java.util.ArrayList; import static com.github.technus.tectech.Util.StuctureCheck; -import static com.github.technus.tectech.elementalMatter.commonValues.*; +import static com.github.technus.tectech.elementalMatter.CommonValues.*; import static gregtech.api.enums.GT_Values.V; import static gregtech.api.enums.GT_Values.VN; @@ -1218,7 +1218,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Nothing special just override me." }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java index bef132bab5..ef9d7b6c63 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; @@ -91,7 +91,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Advanced data transmission", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Don't stare at the beam!", EnumChatFormatting.AQUA + "Must be painted to work", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java index f457de8e0d..543f25120a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java @@ -1,6 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; -import com.github.technus.tectech.elementalMatter.commonValues; +import com.github.technus.tectech.elementalMatter.CommonValues; import com.github.technus.tectech.thing.machineTT; import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; @@ -91,7 +91,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements iConnec @Override public String[] getDescription() { return new String[]{ - commonValues.tecMark, + CommonValues.tecMark, "Quantum tunneling device.", EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Not a portal!!!", EnumChatFormatting.AQUA + "Must be painted to work", diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java new file mode 100644 index 0000000000..e38c05915d --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java @@ -0,0 +1,142 @@ +package com.github.technus.tectech.thing.metaTileEntity.single; + +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.elementalMatter.CommonValues; +import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DebugStructureWriter; +import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DebugStructureWriter; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.objects.GT_RenderedTexture; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import static com.github.technus.tectech.Util.ReverseStructureCheck; + +/** + * Created by Tec on 23.03.2017. + */ +public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_TieredMachineBlock { + public short numbers[]=new short[6]; + public boolean size=false; + public String[] result=new String[]{"Undefined"}; + + public GT_MetaTileEntity_DebugStructureWriter(int aID, String aName, String aNameRegional, int aTier) { + super(aID, aName, aNameRegional, aTier, 0, "Scans Blocks Around"); + } + + public GT_MetaTileEntity_DebugStructureWriter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 0, aDescription, aTextures); + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_DebugStructureWriter(mName,mTier,mDescription,mTextures); + } + + @Override + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1], (aSide != this.getBaseMetaTileEntity().getFrontFacing()) ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_SIDES) : aActive ? new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER_ACTIVE) : new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TELEPORTER)}; + } + + @Override + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + return null; + } + + @Override + public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_Container_DebugStructureWriter(aPlayerInventory, aBaseMetaTileEntity); + } + + @Override + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_DebugStructureWriter(aPlayerInventory, aBaseMetaTileEntity); + } + + @Override + public boolean allowPutStack(IGregTechTileEntity iGregTechTileEntity, int i, byte b, ItemStack itemStack) { + return false; + } + + @Override + public boolean allowPullStack(IGregTechTileEntity iGregTechTileEntity, int i, byte b, ItemStack itemStack) { + return false; + } + + @Override + public void saveNBTData(NBTTagCompound aNBT) { + for(int i=0;i<numbers.length;i++){ + aNBT.setShort("eData"+i,numbers[i]); + } + } + + @Override + public void loadNBTData(NBTTagCompound aNBT) { + for(int i=0;i<numbers.length;i++){ + numbers[i]=aNBT.getShort("eData"+i); + } + } + + @Override + public boolean isSimpleMachine() { + return false; + } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + if(aBaseMetaTileEntity.isAllowedToWork()){ + result=ReverseStructureCheck(this.getBaseMetaTileEntity(),numbers[0],numbers[1],numbers[2],numbers[3],numbers[4],numbers[5]); + if(TecTech.ModConfig.DEBUG_MODE) + for(String s:result) + TecTech.Logger.info(s); + aBaseMetaTileEntity.disableWorking(); + } + } + + @Override + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { + if (aBaseMetaTileEntity.isClientSide()) return true; + aBaseMetaTileEntity.openGUI(aPlayer); + return true; + } + + @Override + public boolean isFacingValid(byte aFacing) { + return true; + } + + @Override + public boolean isElectric() { + return false; + } + + @Override + public boolean isAccessAllowed(EntityPlayer aPlayer) { + return true; + } + + @Override + public String[] getDescription() { + return new String[]{ + CommonValues.tecMark, + this.mDescription, + "Prints Multiblock NonTE structure check code", + "ABC axises aligned to machine front" + }; + } + + @Override + public boolean isGivingInformation() { + return true; + } + + @Override + public String[] getInfoData() { + return result; + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugStructureWriter.java new file mode 100644 index 0000000000..bec3676ce1 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugStructureWriter.java @@ -0,0 +1,144 @@ +package com.github.technus.tectech.thing.metaTileEntity.single.gui; + +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugStructureWriter; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.gui.GT_ContainerMetaTile_Machine; +import gregtech.api.gui.GT_Slot_Holo; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import java.util.Iterator; + +public class GT_Container_DebugStructureWriter + extends GT_ContainerMetaTile_Machine { + public boolean size=false; + public short numbers[]=new short[6]; + public GT_Container_DebugStructureWriter(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { + super(aInventoryPlayer, aTileEntity); + } + + @Override + public void addSlots(InventoryPlayer aInventoryPlayer) { + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 8, 5, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 8, 23, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 8, 41, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 8, 59, false, false, 1)); + + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 26, 5, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 26, 23, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 26, 41, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 26, 59, false, false, 1)); + + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 152, 5, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 152, 23, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 152, 41, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 152, 59, false, false, 1)); + + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 134, 5, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 134, 23, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 134, 41, false, false, 1)); + addSlotToContainer(new GT_Slot_Holo(this.mTileEntity, 2, 134, 59, false, false, 1)); + } + + @Override + public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) { + if (aSlotIndex < 0) { + return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); + } + Slot tSlot = (Slot) this.inventorySlots.get(aSlotIndex); + if ((tSlot != null) && (this.mTileEntity.getMetaTileEntity() != null)) { + GT_MetaTileEntity_DebugStructureWriter dsw=(GT_MetaTileEntity_DebugStructureWriter)mTileEntity.getMetaTileEntity(); + if(dsw.numbers==null)return null; + switch (aSlotIndex) { + case 0: + dsw.numbers[size?3:0] -= (aShifthold == 1 ? 512 : 64); + return null; + case 1: + dsw.numbers[size?4:1] -= (aShifthold == 1 ? 512 : 64); + return null; + case 2: + dsw.numbers[size?5:2] -= (aShifthold == 1 ? 512 : 64); + return null; + case 4: + dsw.numbers[size?3:0] -= (aShifthold == 1 ? 16 : 1); + return null; + case 5: + dsw.numbers[size?4:1] -= (aShifthold == 1 ? 16 : 1); + return null; + case 6: + dsw.numbers[size?5:2] -= (aShifthold == 1 ? 16 : 1); + return null; + case 8: + dsw.numbers[size?3:0] += (aShifthold == 1 ? 512 : 64); + return null; + case 9: + dsw.numbers[size?4:1] += (aShifthold == 1 ? 512 : 64); + return null; + case 10: + dsw.numbers[size?5:2] += (aShifthold == 1 ? 512 : 64); + return null; + case 12: + dsw.numbers[size?3:0] += (aShifthold == 1 ? 16 : 1); + return null; + case 13: + dsw.numbers[size?4:1] += (aShifthold == 1 ? 16 : 1); + return null; + case 14: + dsw.numbers[size?5:2] += (aShifthold == 1 ? 16 : 1); + return null; + case 3: + case 7: + case 11: + case 15: + dsw.size ^= true; + return null; + } + } + return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) { + return; + } + GT_MetaTileEntity_DebugStructureWriter dsw=(GT_MetaTileEntity_DebugStructureWriter)mTileEntity.getMetaTileEntity(); + if(numbers!=null) + System.arraycopy(dsw.numbers, 0, this.numbers, 0, dsw.numbers.length); + this.size = dsw.size; + + Iterator var2 = this.crafters.iterator(); + while (var2.hasNext()) { + ICrafting var1 = (ICrafting) var2.next(); + if(numbers!=null) { + var1.sendProgressBarUpdate(this, 100, this.numbers[0]); + var1.sendProgressBarUpdate(this, 101, this.numbers[1]); + var1.sendProgressBarUpdate(this, 102, this.numbers[2]); + var1.sendProgressBarUpdate(this, 103, this.numbers[3]); + var1.sendProgressBarUpdate(this, 104, this.numbers[4]); + var1.sendProgressBarUpdate(this, 105, this.numbers[5]); + } + var1.sendProgressBarUpdate(this, 106, this.size?1:0); + } + } + + @SideOnly(Side.CLIENT) + public void updateProgressBar(int par1, int par2) { + super.updateProgressBar(par1, par2); + switch (par1) { + case 106: + this.size = par2==1; + break; + default: + if(numbers!=null && par1>=100 && par1<=105) + this.numbers[par1 - 100] = (short) par2; + break; + } + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugStructureWriter.java new file mode 100644 index 0000000000..6a129fa5d6 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugStructureWriter.java @@ -0,0 +1,32 @@ +package com.github.technus.tectech.thing.metaTileEntity.single.gui; + +import gregtech.api.gui.GT_GUIContainerMetaTile_Machine; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.entity.player.InventoryPlayer; + +import static gregtech.api.enums.GT_Values.RES_PATH_GUI; + +public class GT_GUIContainer_DebugStructureWriter extends GT_GUIContainerMetaTile_Machine { + public GT_GUIContainer_DebugStructureWriter(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) { + super(new GT_Container_DebugStructureWriter(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "Teleporter.png"); + } + + protected void drawGuiContainerForegroundLayer(int par1, int par2) { + this.fontRendererObj.drawString("StructPrint", 46, 8, 16448255); + if (this.mContainer != null) { + GT_Container_DebugStructureWriter dsw= (GT_Container_DebugStructureWriter)mContainer; + if(dsw.numbers==null)return; + this.fontRendererObj.drawString(dsw.size?"Size":"Offset", 46, 16, 16448255); + this.fontRendererObj.drawString("A: " + dsw.numbers[dsw.size?3:0], 46, 24, 16448255); + this.fontRendererObj.drawString("B: " + dsw.numbers[dsw.size?4:1], 46, 32, 16448255); + this.fontRendererObj.drawString("C: " + dsw.numbers[dsw.size?5:2], 46, 40, 16448255); + } + } + + protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { + super.drawGuiContainerBackgroundLayer(par1, par2, par3); + int x = (this.width - this.xSize) / 2; + int y = (this.height - this.ySize) / 2; + drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); + } +} |