diff options
9 files changed, 246 insertions, 38 deletions
diff --git a/build.properties b/build.properties index 9e784e469a..754326b807 100644 --- a/build.properties +++ b/build.properties @@ -9,6 +9,6 @@ nei.version=1.0.5.120 gregtech.jenkinsbuild=2 gregtech.version=5.09.32.22 cofhcore.version=[1.7.10]3.1.4-329-dev -cofhlib.version=[1.7.10]1.0.3-175-dev +cofhlib.version=[1.7.10]1.2.1-185-dev yamcore.version=0.5.78 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d1621dd0d4..7b6f003e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Fri May 04 06:18:33 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
\ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftBlockLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftBlockLoader.java new file mode 100644 index 0000000000..c5c960f5b8 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftBlockLoader.java @@ -0,0 +1,11 @@ +package com.github.technus.tectech.compatibility.dreamcraft; + +import com.github.technus.tectech.thing.casing.GT_Block_CasingsNH; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; + +public class NoDreamCraftBlockLoader implements Runnable { + @Override + public void run() { + TT_Container_Casings.sBlockCasingsNH = new GT_Block_CasingsNH(); + } +} diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index b36f880b56..eb4f9c2b9d 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -7,13 +7,30 @@ import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.ITexture; import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; +import net.minecraft.util.EnumChatFormatting; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; -public class NoDreamCraftMachineLoader implements Runnable{ +public class NoDreamCraftMachineLoader implements Runnable { + public final static String imagination=EnumChatFormatting.RESET + + "You just need " + EnumChatFormatting.DARK_PURPLE + + "I" + EnumChatFormatting.LIGHT_PURPLE + + "m" + EnumChatFormatting.DARK_RED + + "a" + EnumChatFormatting.RED + + "g" + EnumChatFormatting.YELLOW + + "i" + EnumChatFormatting.GREEN + + "n" + EnumChatFormatting.AQUA + + "a" + EnumChatFormatting.DARK_AQUA + + "t" + EnumChatFormatting.BLUE + + "i" + EnumChatFormatting.DARK_BLUE + + "o" + EnumChatFormatting.DARK_PURPLE + + "n" + EnumChatFormatting.RESET + + " to use this."; @Override public void run() { @@ -58,47 +75,149 @@ public class NoDreamCraftMachineLoader implements Runnable{ "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); CustomItemList.WetTransformer_UIV_UEV.set(new GT_MetaTileEntity_WetTransformer( - 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer",10, + 12010, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", 10, "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); CustomItemList.WetTransformer_UMV_UIV.set(new GT_MetaTileEntity_WetTransformer( - 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer",11, + 12011, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", 11, "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); CustomItemList.WetTransformer_UXV_UMV.set(new GT_MetaTileEntity_WetTransformer( - 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer",12, + 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12, "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); CustomItemList.WetTransformer_OPV_UXV.set(new GT_MetaTileEntity_WetTransformer( - 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer",13, + 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13, "OPV -> UXV (Use Soft Mallet to invert)").getStackForm(1L)); CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer( - 12014, "wettransformer.tier.14", "Overpowered Power Transformer",14, + 12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14, "MAX -> OPV (Use Soft Mallet to invert)").getStackForm(1L)); - if (Loader.isModLoaded("miscutils")) { - try { + try { + MetaTileEntity temp; + Method method = null; + Field field = null; + Object iTexture = new ITexture[0]; + if (GT_Values.GT.isClientSide()) { + method = GT_MetaTileEntity_TieredMachineBlock.class.getMethod("getTextureSet", ITexture[].class); + field = GT_MetaTileEntity_TieredMachineBlock.class.getField("mTextures"); + field.setAccessible(true); + } + + temp = new GT_MetaTileEntity_BasicHull( + 11230, "hull.tier.10", "UEV Machine Hull",10, + imagination); + Util.setTier(10, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Hull_UEV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_BasicHull( + 11231, "hull.tier.11", "UIV Machine Hull",11, + imagination); + Util.setTier(11, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Hull_UIV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_BasicHull( + 11232, "hull.tier.12", "UMV Machine Hull",12, + imagination); + Util.setTier(12, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Hull_UMV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_BasicHull( + 11233, "hull.tier.13", "UXV Machine Hull",13, + imagination); + Util.setTier(13, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Hull_UXV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_BasicHull( + 11234, "hull.tier.14", "OPV Machine Hull",14, + imagination); + Util.setTier(14, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Hull_OPV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_BasicHull( + 11235, "hull.tier.15", "MAX Machine Hull",15, + imagination); + Util.setTier(15, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Hull_MAXV.set(temp.getStackForm(1L)); + + + temp = new GT_MetaTileEntity_Transformer( + 11220, "transformer.tier.09", "Highly Ultimate Transformer", 9, + "UEV -> UHV (Use Soft Mallet to invert)"); + CustomItemList.Transformer_UEV_UHV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_Transformer( + 11221, "transformer.tier.10", "Extremely Ultimate Transformer", 10, + "UIV -> UEV (Use Soft Mallet to invert)"); + Util.setTier(10, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Transformer_UIV_UEV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_Transformer( + 11222, "transformer.tier.11", "Insanely Ultimate Transformer", 11, + "UMV -> UIV (Use Soft Mallet to invert)"); + Util.setTier(11, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Transformer_UMV_UIV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_Transformer( + 11223, "transformer.tier.12", "Mega Ultimate Transformer", 12, + "UXV -> UMV (Use Soft Mallet to invert)"); + Util.setTier(12, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Transformer_UXV_UMV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_Transformer( + 11224, "transformer.tier.13", "Extended Mega Ultimate Transformer", 13, + "OPV -> UXV (Use Soft Mallet to invert)"); + Util.setTier(13, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Transformer_OPV_UXV.set(temp.getStackForm(1L)); + + temp = new GT_MetaTileEntity_Transformer( + 11225, "transformer.tier.14", "Overpowered Transformer", 14, + "MAX -> OPV (Use Soft Mallet to invert)"); + Util.setTier(14, temp); + if (GT_Values.GT.isClientSide()) { + field.set(temp, method.invoke(temp, iTexture)); + } + CustomItemList.Transformer_MAXV_OPV.set(temp.getStackForm(1L)); + + + if (Loader.isModLoaded("miscutils")) { Class clazz = Class.forName("gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp"); Constructor<MetaTileEntity> constructor = clazz.getConstructor(int.class, String.class, String.class, int.class, String.class); - Method method = null; - Field field = null; - Object iTexture=new ITexture[0]; - if (GT_Values.GT.isClientSide()) { - method = GT_MetaTileEntity_TieredMachineBlock.class.getMethod("getTextureSet", ITexture[].class); - field = GT_MetaTileEntity_TieredMachineBlock.class.getField("mTextures"); - field.setAccessible(true); - } - - MetaTileEntity temp = constructor.newInstance( + temp = constructor.newInstance( 11989, "transformer.ha.tier.09", "Highly Ultimate Hi-Amp Transformer", 9, "UEV -> UHV (Use Soft Mallet to invert)"); - //Util.setTier(9, temp); - //if (GT_Values.GT.isClientSide()) { - // field.set(temp, - // method.invoke(temp, iTexture)); - //} CustomItemList.Transformer_HA_UEV_UHV.set(temp.getStackForm(1)); temp = constructor.newInstance( @@ -106,8 +225,7 @@ public class NoDreamCraftMachineLoader implements Runnable{ "UIV -> UEV (Use Soft Mallet to invert)"); Util.setTier(10, temp); if (GT_Values.GT.isClientSide()) { - field.set(temp, - method.invoke(temp, iTexture)); + field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_HA_UIV_UEV.set(temp.getStackForm(1)); @@ -116,8 +234,7 @@ public class NoDreamCraftMachineLoader implements Runnable{ "UMV -> UIV (Use Soft Mallet to invert)"); Util.setTier(11, temp); if (GT_Values.GT.isClientSide()) { - field.set(temp, - method.invoke(temp, iTexture)); + field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_HA_UMV_UIV.set(temp.getStackForm(1)); @@ -126,8 +243,7 @@ public class NoDreamCraftMachineLoader implements Runnable{ "UXV -> UMV (Use Soft Mallet to invert)"); Util.setTier(12, temp); if (GT_Values.GT.isClientSide()) { - field.set(temp, - method.invoke(temp, iTexture)); + field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_HA_UXV_UMV.set(temp.getStackForm(1)); @@ -136,8 +252,7 @@ public class NoDreamCraftMachineLoader implements Runnable{ "OPV -> UXV (Use Soft Mallet to invert)"); Util.setTier(13, temp); if (GT_Values.GT.isClientSide()) { - field.set(temp, - method.invoke(temp, iTexture)); + field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_HA_OPV_UXV.set(temp.getStackForm(1)); @@ -146,13 +261,12 @@ public class NoDreamCraftMachineLoader implements Runnable{ "MAX -> OPV (Use Soft Mallet to invert)"); Util.setTier(14, temp); if (GT_Values.GT.isClientSide()) { - field.set(temp, - method.invoke(temp, iTexture)); + field.set(temp, method.invoke(temp, iTexture)); } CustomItemList.Transformer_HA_MAXV_OPV.set(temp.getStackForm(1)); - } catch (Exception e) { - e.printStackTrace(); } + } catch (Exception e) { + e.printStackTrace(); } } } diff --git a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java index 84d1a8ab0c..33bd97611e 100644 --- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.compatibility.dreamcraft.NoDreamCraftBlockLoader; import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.block.QuantumStuffBlock; import com.github.technus.tectech.thing.block.ReactorSimBlock; @@ -25,6 +26,10 @@ public class ThingsLoader implements Runnable { if(Textures.BlockIcons.casingTexturePages[tectechTexturePage1]==null) { Textures.BlockIcons.casingTexturePages[tectechTexturePage1] = new ITexture[128]; } + if(!Loader.isModLoaded("dreamcraft")){ + TecTech.Logger.info("Adding basic casings"); + new NoDreamCraftBlockLoader().run(); + } TecTech.Logger.info("Added texture page if was null"); TT_Container_Casings.sBlockCasingsTT = new GT_Block_CasingsTT(); TecTech.Logger.info("Elemental Casing registered"); 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 254a567bc8..a062693db4 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,10 @@ import net.minecraft.item.ItemStack; import static gregtech.api.enums.GT_Values.W; public enum CustomItemList implements IItemContainer { + Casing_UEV,Casing_UIV,Casing_UMV,Casing_UXV,Casing_OPV,Casing_MAXV, + Hull_UEV,Hull_UIV,Hull_UMV,Hull_UXV,Hull_OPV,Hull_MAXV, + Transformer_UEV_UHV,Transformer_UIV_UEV,Transformer_UMV_UIV, + Transformer_UXV_UMV,Transformer_OPV_UXV,Transformer_MAXV_OPV, WetTransformer_LV_ULV,WetTransformer_MV_LV,WetTransformer_HV_MV,WetTransformer_EV_HV, WetTransformer_IV_EV,WetTransformer_LuV_IV,WetTransformer_ZPM_LuV,WetTransformer_UV_ZPM, WetTransformer_UHV_UV,WetTransformer_UEV_UHV,WetTransformer_UIV_UEV,WetTransformer_UMV_UIV, diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java new file mode 100644 index 0000000000..78b0a2a6a9 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java @@ -0,0 +1,59 @@ +package com.github.technus.tectech.thing.casing; + +import com.github.technus.tectech.thing.CustomItemList; +import gregtech.api.enums.Textures; +import gregtech.api.objects.GT_CopiedBlockTexture; +import gregtech.api.util.GT_LanguageManager; +import gregtech.common.blocks.GT_Block_Casings_Abstract; +import gregtech.common.blocks.GT_Material_Casings; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; + +/** + * Created by danie_000 on 03.10.2016. + */ +public class GT_Block_CasingsNH + extends GT_Block_Casings_Abstract { + public static boolean mConnectedMachineTextures = true; + + public GT_Block_CasingsNH() { + super(GT_Item_CasingsNH.class, "gt.blockcasingsNH", GT_Material_Casings.INSTANCE); + for (byte b = 0; b < 16; b = (byte) (b + 1)) { + Textures.BlockIcons.casingTexturePages[8][b+64] = new GT_CopiedBlockTexture(this, 6, b); + /*IMPORTANT for block recoloring*/ + } + + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "UEV Machine Casing");//adding + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "UIV Machine Casing");//adding + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "UMV Machine Casing");//adding + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "UXV Machine Casing");//adding + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "OPV Machine Casing");//adding + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "MAX Machine Casing");//adding + + CustomItemList.Casing_UEV.set(new ItemStack(this,1,10)); + CustomItemList.Casing_UIV.set(new ItemStack(this,1,11)); + CustomItemList.Casing_UMV.set(new ItemStack(this,1,12)); + CustomItemList.Casing_UXV.set(new ItemStack(this,1,13)); + CustomItemList.Casing_OPV.set(new ItemStack(this,1,14)); + CustomItemList.Casing_MAXV.set(new ItemStack(this,1,15)); + } + + @Override + public void registerBlockIcons(IIconRegister aIconRegister) { + //super.registerBlockIcons(aIconRegister); + } + + @Override + public IIcon getIcon(int aSide, int aMeta) { + if (aSide == 0) { + return MACHINECASINGS_BOTTOM_TT[aMeta].getIcon(); + } + if (aSide == 1) { + return MACHINECASINGS_TOP_TT[aMeta].getIcon(); + } + return MACHINECASINGS_SIDE_TT[aMeta].getIcon(); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java new file mode 100644 index 0000000000..68a835c00a --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java @@ -0,0 +1,14 @@ +package com.github.technus.tectech.thing.casing; + +import gregtech.common.blocks.GT_Item_Casings_Abstract; +import net.minecraft.block.Block; + +/** + * Created by danie_000 on 03.10.2016. + */ +public class GT_Item_CasingsNH + extends GT_Item_Casings_Abstract { + public GT_Item_CasingsNH(Block par1) { + super(par1); + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java index 4526a98f2e..851046f34b 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java @@ -8,6 +8,7 @@ import net.minecraft.block.Block; public final class TT_Container_Casings { public static Block sBlockCasingsTT; public static Block sHintCasingsTT; + public static Block sBlockCasingsNH; private TT_Container_Casings() {} } |