From c0fd973ba6812825160b49db0c59c08ca67eca4d Mon Sep 17 00:00:00 2001 From: Tec Date: Sat, 10 Mar 2018 09:33:07 +0100 Subject: Changes and draft of Assline data hatches --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gradle/wrapper') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8de3..692a0d0831 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 +#Sat Mar 10 07:59:03 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip -- cgit From a3d465484f771fa6dfe48b9aecc787af778694f5 Mon Sep 17 00:00:00 2001 From: Stefan Thomanek Date: Fri, 4 May 2018 06:12:01 +0200 Subject: Proposed changes (#9) * Additions for automatic jarSign on Jenkins * Required changes for the new jenkins/nexus location * Apply these changes to get CoFH Lib and core back. curseCDN will 403 you --- build.gradle | 38 ++++++++++++++++++++++---------- build.properties | 10 ++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 32 insertions(+), 20 deletions(-) (limited to 'gradle/wrapper') diff --git a/build.gradle b/build.gradle index 9137fbf07d..440fee920a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ buildscript { import de.undercouch.gradle.tasks.download.Download apply plugin: 'forge' +apply plugin: 'signing' allprojects { apply plugin: 'java' @@ -52,20 +53,18 @@ configurations { repositories { maven { name 'UsrvDE' - url "http://jenkins.usrv.de:8082/nexus/content/repositories/releases/" + url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" } maven { name = "ic2" url = "http://maven.ic2.player.to/" } - //ivy { - // name 'CoFHLib' - // artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhlib.cf}/[module]-[revision].[ext]" - //} - //ivy { - // name 'CoFHCore' - // artifactPattern "http://addons-origin.cursecdn.com/files/${config.cofhcore.cf}/[module]-[revision].[ext]" - //} + + ivy { + name 'gtnh_download_source' + artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]" + } + maven { name = "chickenbones" url = "http://chickenbones.net/maven/" @@ -75,8 +74,8 @@ repositories { dependencies { compile "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf" compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" - //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' - //provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' + provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev" @@ -86,7 +85,7 @@ task getGregTech(type: Download) { onlyIf { !file("libs/gregtech-${config.gregtech.version}-dev.jar").exists() } - src "http://jenkins.usrv.de:8081/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar" + src "http://jenkins.usrv.eu:8080/job/Gregtech-5-Unofficial/${config.gregtech.jenkinsbuild}/artifact/build/libs/gregtech-${config.gregtech.version}-dev.jar" dest file("libs/gregtech-${config.gregtech.version}-dev.jar") mustRunAfter "deobfBinJar" mustRunAfter "repackMinecraft" @@ -117,3 +116,18 @@ processResources exclude 'mcmod.info' } } + +task signJar(dependsOn: 'reobf'){ + doLast { + ant.signjar( + destDir: jar.destinationDir, + jar: jar.getArchivePath(), + alias: findProperty('keyStoreAlias') ?: '', + keystore: findProperty('keyStore') ?: '', + storepass: findProperty('keyStorePass') ?: '', + digestalg: findProperty('signDigestAlg') ?: '', + tsaurl: findProperty('signTSAurl') ?: '', + verbose: true + ) + } +} diff --git a/build.properties b/build.properties index b76fc301bd..9e784e469a 100644 --- a/build.properties +++ b/build.properties @@ -6,11 +6,9 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=884 -gregtech.version=5.09.32.06 -cofhcore.cf=2246/920 -cofhcore.version=[1.7.10]3.0.3-303-dev -cofhlib.cf=2246/918 +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 -yamcore.version=0.5.77 +yamcore.version=0.5.78 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 692a0d0831..d1621dd0d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 10 07:59:03 CET 2018 +#Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip \ No newline at end of file -- cgit From bee10a99218b253099d5d3fb29f9a4277a97bb85 Mon Sep 17 00:00:00 2001 From: Tec Date: Sun, 6 May 2018 09:41:25 +0200 Subject: update dependencies, add more basic blocks from GTNH --- build.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- .../dreamcraft/NoDreamCraftBlockLoader.java | 11 ++ .../dreamcraft/NoDreamCraftMachineLoader.java | 184 +++++++++++++++++---- .../technus/tectech/loader/ThingsLoader.java | 5 + .../technus/tectech/thing/CustomItemList.java | 4 + .../tectech/thing/casing/GT_Block_CasingsNH.java | 59 +++++++ .../tectech/thing/casing/GT_Item_CasingsNH.java | 14 ++ .../tectech/thing/casing/TT_Container_Casings.java | 1 + 9 files changed, 246 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftBlockLoader.java create mode 100644 src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java create mode 100644 src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsNH.java (limited to 'gradle/wrapper') 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 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() {} } -- cgit From 1597d5c7d13201e06ed62457a01831eff47d6f47 Mon Sep 17 00:00:00 2001 From: Tec Date: Sun, 9 Dec 2018 15:46:48 +0100 Subject: Fix using bad number type in add line recipes... --- .idea/vcs.xml | 6 ------ GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar | Bin 3287685 -> 0 bytes build.gradle | 6 +++--- build.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 51017 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../technus/tectech/recipe/TT_recipeAdder.java | 4 ++-- 7 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 .idea/vcs.xml delete mode 100644 GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar (limited to 'gradle/wrapper') diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4c..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar b/GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar deleted file mode 100644 index 45d7dc3183..0000000000 Binary files a/GTNewHorizonsCoreMod-1.7.10-1.5.10-.jar and /dev/null differ diff --git a/build.gradle b/build.gradle index 440fee920a..6fccbe64e8 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,8 @@ apply plugin: 'signing' allprojects { apply plugin: 'java' - sourceCompatibility = 1.7 - targetCompatibility = 1.7 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } file "build.properties" withReader { @@ -74,7 +74,7 @@ repositories { dependencies { compile "eu.usrv:YAMCore:${config.minecraft.version}-${config.yamcore.version}:deobf" compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev" - provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' + //provided name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar' provided name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar' compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.codechickenlib.version}:dev" compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.codechickencore.version}:dev" diff --git a/build.properties b/build.properties index 4a262ce947..7cdca650d8 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=175 +gregtech.jenkinsbuild=192 gregtech.version=5.09.33.03 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216703..3baa851b28 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b6f003e09..e4af87c689 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 04 06:18:33 CEST 2018 +#Tue Dec 04 18:55:27 CET 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java index b7e96707be..f38fc1fc60 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java @@ -77,7 +77,7 @@ public class TT_recipeAdder extends GT_RecipeAdder { ItemStack[] aStacks = (ItemStack[]) obj; if (aStacks.length > 0) { tInputs[i] = aStacks[0]; - tAlts[i] = (ItemStack[]) Arrays.copyOf(aStacks, aStacks.length); + tAlts[i] = Arrays.copyOf(aStacks, aStacks.length); continue; } } else if (obj instanceof Object[]) { @@ -85,7 +85,7 @@ public class TT_recipeAdder extends GT_RecipeAdder { List tList; if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) { try { - int tAmount = (int) objs[1]; + int tAmount = ((Number) objs[1]).intValue(); List uList = new ArrayList<>(); for (ItemStack tStack : tList) { ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack); -- cgit