diff options
3 files changed, 35 insertions, 40 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 1f097803c6..4904e0d78c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,20 +1,20 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.297-pre:dev') - api("com.github.GTNewHorizons:EnderCore:0.2.11:dev") - api("com.github.GTNewHorizons:EnderIO:2.3.1.47:dev") + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.48:dev') + api("com.github.GTNewHorizons:EnderCore:0.2.13:dev") + api("com.github.GTNewHorizons:EnderIO:2.4.9:dev") api("com.github.GTNewHorizons:Infernal-Mobs:1.7.5-GTNH:dev") - api("com.github.GTNewHorizons:ForestryMC:4.5.6:dev") + api("com.github.GTNewHorizons:ForestryMC:4.6.5:dev") api("com.github.GTNewHorizons:ModularUI:1.1.0:dev") //compileOnly("curse.maven:extrautilities-225561:2264384") { // transitive = false //} - compileOnly("com.github.GTNewHorizons:GTplusplus:1.7.134:dev") + compileOnly("com.github.GTNewHorizons:GTplusplus:1.8.31:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.3.18:dev") + compileOnly("com.github.GTNewHorizons:BloodMagic:1.3.25:dev") { transitive = false } @@ -22,23 +22,23 @@ dependencies { { transitive = false } - compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.9:dev") + compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:bartworks:0.6.1:dev") + compileOnly("com.github.GTNewHorizons:bartworks:0.6.7:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.103:dev") + compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.0.15:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.3.39-GTNH:dev") + compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.0-GTNH:dev") { transitive = false } - runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") + runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev") runtimeOnly("curse.maven:cofh-core-69162:2388751") /* { @@ -48,17 +48,17 @@ dependencies { */ // For testing - //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.3.39-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.7.134:dev") + //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.0-GTNH:dev") + //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.8.31:dev") //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.0.18-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:1.9.103:dev") + //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.0.15:dev") //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.6.9-GTNH:dev") - //runtimeOnly("com.github.GTNewHorizons:bartworks:0.6.1:dev") - //runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.9:dev") + //runtimeOnly("com.github.GTNewHorizons:bartworks:0.6.7:dev") + //runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev") //api("com.github.GTNewHorizons:SpecialMobs:3.3.13:dev") //api("com.github.GTNewHorizons:twilightforest:2.3.8.17:dev") //api("com.github.GTNewHorizons:EnderZoo:1.0.23:dev") //runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - //runtimeOnly("com.github.GTNewHorizons:BloodMagic:1.3.18:dev") + //runtimeOnly("com.github.GTNewHorizons:BloodMagic:1.3.25:dev") //api("curse.maven:witchery-69673:2234410") } diff --git a/src/main/java/kubatech/client/effect/CropRenderer.java b/src/main/java/kubatech/client/effect/CropRenderer.java index e9b6aac3dc..c57f8a8590 100644 --- a/src/main/java/kubatech/client/effect/CropRenderer.java +++ b/src/main/java/kubatech/client/effect/CropRenderer.java @@ -10,13 +10,12 @@ package kubatech.client.effect; -import java.lang.reflect.Field; - +import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Blocks; -import net.minecraft.launchwrapper.Launch; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -28,7 +27,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class CropRenderer extends EntityFX { int[] meta = new int[8]; - static Field tessellatorHasBrightnessField = null; public CropRenderer(World world, int x, int y, int z, int age) { super(world, (double) x, ((double) y - 0.0625d), (double) z); @@ -48,19 +46,18 @@ public class CropRenderer extends EntityFX { public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) { Tessellator tessellator = Tessellator.instance; - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDepthMask(false); - try { - if (tessellatorHasBrightnessField == null) { - tessellatorHasBrightnessField = Tessellator.class.getDeclaredField( - (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment") ? "hasBrightness" - : "field_78414_p"); - tessellatorHasBrightnessField.setAccessible(true); - } - tessellatorHasBrightnessField.set(tessellator, false); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } + Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + tessellator.startDrawingQuads(); + tessellator.disableColor(); + GL11.glColor4f(1.f, 1.f, 1.f, 1.f); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glDepthMask(true); + tessellator.setBrightness( + Blocks.wheat.getMixedBrightnessForBlock( + this.worldObj, + (int) this.posX + 1, + (int) this.posY, + (int) this.posZ)); tessellator.setColorRGBA(255, 255, 255, 255); double f12 = this.posY - interpPosY; int i = 0; @@ -70,18 +67,16 @@ public class CropRenderer extends EntityFX { double f13 = (this.posZ + (double) z) - interpPosZ; RenderBlocks.getInstance().renderBlockCropsImpl(Blocks.wheat, meta[i++], f11, f12, f13); } - - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glDepthMask(true); + tessellator.draw(); } @Override public int getFXLayer() { - return 1; + return 3; } @Override public boolean shouldRenderInPass(int pass) { - return pass == 2; + return pass == 3; } } diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java index 372fe819e2..00cfd2f0cc 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java @@ -152,7 +152,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse 'l', LoaderReference.ProjRedIllumination ? ofBlock(Block.getBlockFromName("ProjRed|Illumination:projectred.illumination.lamp"), 10) - : ofBlock(Blocks.redstone_lamp, 0)) + : ofChain(ofBlock(Blocks.redstone_lamp, 0), ofBlock(Blocks.lit_redstone_lamp, 0))) .addElement( 'g', LoaderReference.Bartworks ? BorosilicateGlass.ofBoroGlass( |