diff --git a/dependencies.gradle b/dependencies.gradle index 83638fa18..05da65e79 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,20 +1,20 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles-Expanded:2.2.9-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.9.36:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.2.14-GTNH:dev') + api('com.github.GTNewHorizons:GTNHLib:0.9.62:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.73-GTNH:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.17.23:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.16-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.60:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.96-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Railcraft:9.17.26:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.20-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - compileOnly("com.github.GTNewHorizons:StructureLib:1.4.32:dev") + compileOnly("com.github.GTNewHorizons:StructureLib:1.4.34:dev") } diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index b30b55074..fa4ed510e 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect -toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee312..d997cfc60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index adff685a0..0262dcbd5 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/settings.gradle b/settings.gradle index 035355de6..407aea221 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.23' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' } diff --git a/src/main/java/vazkii/botania/client/render/item/RenderLens.java b/src/main/java/vazkii/botania/client/render/item/RenderLens.java index a3b71c2f4..043cfd3ae 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderLens.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderLens.java @@ -12,10 +12,8 @@ package vazkii.botania.client.render.item; import java.awt.Color; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; @@ -27,9 +25,6 @@ import vazkii.botania.common.item.lens.ItemLens; public class RenderLens implements IItemRenderer { - static RenderItem render = new RenderItem(); - ItemRenderer renderer = new ItemRenderer(Minecraft.getMinecraft()); - @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type != ItemRenderType.INVENTORY; @@ -42,25 +37,22 @@ public class RenderLens implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - switch(type) { - case ENTITY : { - GL11.glPushMatrix(); - GL11.glTranslatef(-0.5F, 0F, 0F); - if(item.isOnItemFrame()) - GL11.glTranslatef(0F, -0.3F, 0.01F); - render(item); - GL11.glPopMatrix(); - break; - } - case EQUIPPED : { - render(item); - break; - } - case EQUIPPED_FIRST_PERSON : { - render(item); - break; - } - default : break; + switch (type) { + case ENTITY: { + GL11.glPushMatrix(); + GL11.glTranslatef(-0.5F, 0F, 0F); + if (item.isOnItemFrame()) + GL11.glTranslatef(0F, -0.3F, 0.01F); + render(item); + GL11.glPopMatrix(); + break; + } + case EQUIPPED, EQUIPPED_FIRST_PERSON: { + render(item); + break; + } + default: + break; } } @@ -111,7 +103,7 @@ public class RenderLens implements IItemRenderer { float zLevel = 0F; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - if(shiny) + if (shiny) tessellator.setBrightness(240); tessellator.addVertexWithUV(par1 + 0, par2 + par5, zLevel, icon.getMinU(), icon.getMaxV()); tessellator.addVertexWithUV(par1 + par4, par2 + par5, zLevel, icon.getMaxU(), icon.getMaxV()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index f6408465a..2b9fcdf7b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -52,7 +51,6 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { private static final ResourceLocation textureMossy = new ResourceLocation(LibResources.MODEL_ALTAR_MOSSY); ModelAltar model = new ModelAltar(); - RenderItem renderItem = new RenderItem(); RenderBlocks renderBlocks = new RenderBlocks(); public static int forceMeta = -1; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 24830ff0b..3fe6fc323 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -61,6 +61,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { model.render(this, time); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); + brewery = null; } public void renderItemStack(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 88aa6dacc..0d33b87f4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -11,7 +11,6 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; @@ -33,15 +32,12 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE); ModelCrystalCube model = new ModelCrystalCube(); - EntityItem entity = null; + EntityItem entity = new EntityItem(null, 0, 0, 0, new ItemStack(Blocks.stone)); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTicks) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileEntity; - if(entity == null) - entity = new EntityItem(cube.getWorldObj(), cube.xCoord, cube.yCoord, cube.zCoord, new ItemStack(Blocks.stone)); - entity.age = ClientTickHandler.ticksInGame; ItemStack stack = cube.getRequestTarget(); entity.setEntityItemStack(stack); @@ -67,7 +63,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { GL11.glTranslatef(0F, 0.8F, 0F); GL11.glScalef(s, s, s); GL11.glRotatef(180F, 0F, 0F, 1F); - ((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(entity, 0, 0, 0, 1F, partialTicks); + RenderManager.instance.entityRenderMap.get(EntityItem.class).doRender(entity, 0, 0, 0, 1F, partialTicks); GL11.glPopMatrix(); mc.renderEngine.bindTexture(texture); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 87bfb6fe6..7bbc21d10 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -12,15 +12,13 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; @@ -32,8 +30,7 @@ import vazkii.botania.common.block.tile.TileEnchanter; public class RenderTileEnchanter extends TileEntitySpecialRenderer { - RenderItem renderItem = new RenderItem(); - EntityItem item; + EntityItem item = new EntityItem(null, 0, 0, 0, new ItemStack(Blocks.stone)); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTicks) { @@ -48,15 +45,12 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { alphaMod = 1F; if(enchanter.itemToEnchant != null) { - if(item == null) - item = new EntityItem(enchanter.getWorldObj(), enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant); - item.age = ClientTickHandler.ticksInGame; item.setEntityItemStack(enchanter.itemToEnchant); GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glTranslatef(0.5F, 1.25F, 0.5F); - ((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(item, x, y, z, 1F, partialTicks); + RenderManager.instance.entityRenderMap.get(EntityItem.class).doRender(item, x, y, z, 1F, partialTicks); GL11.glTranslatef(-0.5F, -1.25F, -0.5F); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 6dbad8ebd..b758fb5c0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -15,8 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.passive.EntitySheep; @@ -44,7 +42,6 @@ public class RenderTilePool extends TileEntitySpecialRenderer { private static final ResourceLocation textureDil = new ResourceLocation(LibResources.MODEL_DILUTED_POOL); private static final ModelPool model = new ModelPool(); - RenderItem renderItem = new RenderItem(); public static int forceMeta = 0; public static boolean forceMana = false; diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 90c677133..631052744 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -47,9 +47,6 @@ public class SkyblockSkyRenderer extends IRenderHandler { @Override public void render(float partialTicks, WorldClient world, Minecraft mc) { - boolean test = false; - if(test) - return; int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST);