diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 97fb8ff82..fd6721879 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -21,6 +21,7 @@ import net.minecraft.state.properties.RailShape; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.BiomeBrickVariant; @@ -48,7 +49,7 @@ public final class BotaniaStateProps { public static final PropertyObject HELD_STATE = new PropertyObject<>("held_state", IBlockState.class); // The property for platform world object - public static final PropertyObject HELD_WORLD = new PropertyObject<>("held_world", IBlockAccess.class); + public static final PropertyObject HELD_WORLD = new PropertyObject<>("held_world", IBlockReader.class); // The proeprty for platform world pos public static final PropertyObject HELD_POS = new PropertyObject<>("held_pos", BlockPos.class); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index f4a891b61..6e3c835c3 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -12,9 +12,9 @@ package vazkii.botania.client.core.proxy; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.entity.model.ModelBiped; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 4d714addd..9871c209b 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -1,6 +1,5 @@ package vazkii.botania.client.fx; -import gnu.trove.map.hash.TIntIntHashMap; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; @@ -14,15 +13,17 @@ import vazkii.botania.common.core.helper.Vector3; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Random; // Originally taken with permission from WRCBE - heavily modified public class FXLightning extends Particle { private static final int fadetime = 20; - private final TIntIntHashMap splitParents = new TIntIntHashMap(); + private final Map splitParents = new HashMap<>(); private final double length; private final Random rand; private final int colorOuter; @@ -40,8 +41,8 @@ public class FXLightning extends Particle { this.colorOuter = colorOuter; this.colorInner = colorInner; length = targetvec.subtract(sourcevec).mag(); - particleMaxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; - particleAge = -(int) (length * speed); + maxAge = fadetime + rand.nextInt(fadetime) - fadetime / 2; + age = -(int) (length * speed); segments.add(new FXLightningSegment(sourcevec, targetvec)); @@ -55,7 +56,7 @@ public class FXLightning extends Particle { calculateCollisionAndDiffs(); - Collections.sort(segments, (o1, o2) -> Float.compare(o2.light, o1.light)); + segments.sort((o1, o2) -> Float.compare(o2.light, o1.light)); } @Override @@ -67,7 +68,7 @@ public class FXLightning extends Particle { ParticleRenderDispatcher.lightningCount++; BufferBuilder wr = Tessellator.getInstance().getBuffer(); - float boltAge = particleAge < 0 ? 0 : (float) particleAge / (float) particleMaxAge; + float boltAge = age < 0 ? 0 : (float) age / (float) maxAge; float mainAlpha; if(pass == 0) mainAlpha = (1 - boltAge) * 0.4F; @@ -75,8 +76,8 @@ public class FXLightning extends Particle { int expandTime = (int) (length * speed); - int renderstart = (int) ((expandTime / 2 - particleMaxAge + particleAge) / (float) (expandTime / 2) * segmentCount); - int renderend = (int) ((particleAge + expandTime) / (float) expandTime * segmentCount); + int renderstart = (int) ((expandTime / 2 - maxAge + age) / (float) (expandTime / 2) * segmentCount); + int renderend = (int) ((age + expandTime) / (float) expandTime * segmentCount); for(FXLightningSegment rendersegment : segments) { if(rendersegment.segmentNo < renderstart || rendersegment.segmentNo > renderend) @@ -185,23 +186,23 @@ public class FXLightning extends Particle { if(mop == null) return prevresistance; - if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { + if(mop.type == RayTraceResult.Type.BLOCK) { Block block = world.getBlockState(mop.getBlockPos()).getBlock(); if(world.isAirBlock(mop.getBlockPos())) return prevresistance; - return prevresistance + block.getExplosionResistance(null) + 0.3F; + return prevresistance + block.getExplosionResistance() + 0.3F; } else return prevresistance; } private void calculateCollisionAndDiffs() { - TIntIntHashMap lastactivesegment = new TIntIntHashMap(); + Map lastactivesegment = new HashMap<>(); - Collections.sort(segments, (o1, o2) -> { - int comp = Integer.valueOf(o1.splitNo).compareTo(o2.splitNo); - if(comp == 0) - return Integer.valueOf(o1.segmentNo).compareTo(o2.segmentNo); + segments.sort((o1, o2) -> { + int comp = Integer.compare(o1.splitNo, o2.splitNo); + if (comp == 0) + return Integer.compare(o1.segmentNo, o2.segmentNo); else return comp; }); @@ -241,7 +242,7 @@ public class FXLightning extends Particle { } private static Vector3 getRelativeViewVector(Vector3 pos) { - Entity renderEntity = Minecraft.getMinecraft().getRenderViewEntity(); + Entity renderEntity = Minecraft.getInstance().getRenderViewEntity(); return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index eaa632994..cb16407fb 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -55,7 +55,7 @@ public class FXSparkle extends Particle { particleGravity = 0; motionX = motionY = motionZ = 0; particleScale *= size; - particleMaxAge = 3 * m; + maxAge = 3 * m; multiplier = m; setSize(0.01F, 0.01F); prevPosX = posX; @@ -67,8 +67,8 @@ public class FXSparkle extends Particle { ParticleRenderDispatcher.sparkleFxCount = 0; ParticleRenderDispatcher.fakeSparkleFxCount = 0; - GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F); + Minecraft.getInstance().textureManager.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); for(FXSparkle sparkle : queuedRenders) @@ -91,14 +91,14 @@ public class FXSparkle extends Particle { ParticleRenderDispatcher.fakeSparkleFxCount++; else ParticleRenderDispatcher.sparkleFxCount++; - int part = particle + particleAge/multiplier; + int part = particle + age/multiplier; float var8 = part % 8 / 8.0F; float var9 = var8 + 0.0624375F*2; float var10 = part / 8 / 8.0F; float var11 = var10 + 0.0624375F*2; float var12 = 0.1F * particleScale; - if (shrink) var12 *= (particleMaxAge-particleAge+1)/(float)particleMaxAge; + if (shrink) var12 *= (maxAge-age+1)/(float)maxAge; float var13 = (float)(prevPosX + (posX - prevPosX) * f - interpPosX); float var14 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); @@ -130,12 +130,12 @@ public class FXSparkle extends Particle { } @Override - public void onUpdate() { + public void tick() { prevPosX = posX; prevPosY = posY; prevPosZ = posZ; - if (particleAge++ >= particleMaxAge) + if (age++ >= maxAge) setExpired(); motionY -= 0.04D * particleGravity; @@ -156,7 +156,7 @@ public class FXSparkle extends Particle { } } - if(fake && particleAge > 1) + if(fake && age > 1) setExpired(); } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 904177a68..593f9976a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.fml.client.FMLClientHandler; import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; @@ -53,20 +52,20 @@ public class FXWisp extends Particle { motionX = motionY = motionZ = 0; particleScale *= size; moteParticleScale = particleScale; - particleMaxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul); + maxAge = (int)(28D / (Math.random() * 0.3D + 0.7D) * maxAgeMul); this.depthTest = depthTest; - moteHalfLife = particleMaxAge / 2; + moteHalfLife = maxAge / 2; setSize(0.01F, 0.01F); - Entity renderentity = FMLClientHandler.instance().getClient().getRenderViewEntity(); + Entity renderentity = Minecraft.getInstance().getRenderViewEntity(); if(distanceLimit) { int visibleDistance = 50; - if (!FMLClientHandler.instance().getClient().gameSettings.fancyGraphics) + if (!Minecraft.getInstance().gameSettings.fancyGraphics) visibleDistance = 25; if (renderentity == null || renderentity.getDistance(posX, posY, posZ) > visibleDistance) - particleMaxAge = 0; + maxAge = 0; } prevPosX = posX; @@ -78,8 +77,8 @@ public class FXWisp extends Particle { ParticleRenderDispatcher.wispFxCount = 0; ParticleRenderDispatcher.depthIgnoringWispFxCount = 0; - GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); - Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F); + Minecraft.getInstance().textureManager.bindTexture(ConfigHandler.matrixMode ? vanillaParticles : particles); if(!queuedRenders.isEmpty()) { tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); @@ -89,12 +88,12 @@ public class FXWisp extends Particle { } if(!queuedDepthIgnoringRenders.isEmpty()) { - GlStateManager.disableDepth(); + GlStateManager.disableDepthTest(); tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); - GlStateManager.enableDepth(); + GlStateManager.enableDepthTest(); } queuedRenders.clear(); @@ -106,7 +105,7 @@ public class FXWisp extends Particle { ParticleRenderDispatcher.wispFxCount++; else ParticleRenderDispatcher.depthIgnoringWispFxCount++; - float agescale = (float)particleAge / (float) moteHalfLife; + float agescale = (float)age / (float) moteHalfLife; if (agescale > 1F) agescale = 2 - agescale; @@ -141,12 +140,12 @@ public class FXWisp extends Particle { // [VanillaCopy] of super, without drag when onGround is true @Override - public void onUpdate() { + public void tick() { this.prevPosX = this.posX; this.prevPosY = this.posY; this.prevPosZ = this.posZ; - if (this.particleAge++ >= this.particleMaxAge) + if (this.age++ >= this.maxAge) { this.setExpired(); } diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index ea20506b2..958483cc8 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -30,7 +30,7 @@ public final class ParticleRenderDispatcher { public static void dispatch() { Tessellator tessellator = Tessellator.getInstance(); - Profiler profiler = Minecraft.getMinecraft().profiler; + Profiler profiler = Minecraft.getInstance().profiler; GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.depthMask(false); diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 94a0e1098..c77956b4f 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -44,6 +44,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; @@ -51,6 +52,7 @@ import java.util.ArrayList; import java.util.EnumMap; import java.util.List; import java.util.Map; +import java.util.Random; public class FloatingFlowerModel implements IBakedModel { @@ -67,7 +69,7 @@ public class FloatingFlowerModel implements IBakedModel { case POSITION: { float[] newData = new float[4]; Vector4f vec = new Vector4f(data); - transform.getMatrix().transform(vec); + transform.getMatrixVec().transform(vec); vec.get(newData); parent.put(element, newData); break; @@ -85,9 +87,9 @@ public class FloatingFlowerModel implements IBakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing face, long rand) { + public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { if(state.getBlock() != ModBlocks.floatingSpecialFlower && state.getBlock() != ModBlocks.floatingFlower) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); IExtendedBlockState realState = (IExtendedBlockState) state; IFloatingFlower.IslandType islandType = realState.getValue(BotaniaStateProps.ISLAND_TYPE); ResourceLocation identifier; @@ -97,7 +99,7 @@ public class FloatingFlowerModel implements IBakedModel { identifier = realState.getValue(BotaniaStateProps.SUBTILE_ID); } else { // Mundane flower - identifier = new ResourceLocation(LibMisc.MOD_ID, MUNDANE_PREFIX + state.getValue(BotaniaStateProps.COLOR).getMetadata()); + identifier = new ResourceLocation(LibMisc.MOD_ID, MUNDANE_PREFIX + state.get(BotaniaStateProps.COLOR)); } return getModel(islandType, identifier).getQuads(state, face, rand); @@ -105,7 +107,7 @@ public class FloatingFlowerModel implements IBakedModel { // Get the model for this islandtype + flower type combination. If it's not cached already, generate it. private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, ResourceLocation identifier) { - ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager(); + ModelManager modelManager = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getModelManager(); if(CACHE.contains(islandType, identifier)) { return CACHE.get(islandType, identifier); @@ -125,7 +127,7 @@ public class FloatingFlowerModel implements IBakedModel { } else { ItemStack stack = ItemBlockSpecialFlower.ofType(identifier); IBakedModel specialFlowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); - flowerModel = specialFlowerModel.getOverrides().handleItemState(specialFlowerModel, stack, null, null); + flowerModel = specialFlowerModel.getOverrides().getModelWithOverrides(specialFlowerModel, stack, null, null); } // Enhance! @@ -145,7 +147,7 @@ public class FloatingFlowerModel implements IBakedModel { @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return true; } @Override public boolean isBuiltInRenderer() { return false; } - @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/dirt"); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getInstance().getTextureMap().getAtlasSprite("minecraft:blocks/dirt"); } @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } private static class CompositeBakedModel implements IBakedModel { @@ -162,27 +164,27 @@ public class FloatingFlowerModel implements IBakedModel { ImmutableList.Builder genBuilder = ImmutableList.builder(); final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null)); - for(EnumFacing e : EnumFacing.VALUES) + for(EnumFacing e : EnumFacing.BY_INDEX) faceQuads.put(e, new ArrayList<>()); // Add flower quads, scaled and translated - flower.getQuads(null, null, 0).stream().map(q -> transform(q, transform)).forEach(genBuilder::add); - for(EnumFacing e : EnumFacing.VALUES) { + flower.getQuads(null, null, new Random(0)).stream().map(q -> transform(q, transform)).forEach(genBuilder::add); + for(EnumFacing e : EnumFacing.BY_INDEX) { List faceQ = faceQuads.get(e); - flower.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).forEach(faceQ::add); + flower.getQuads(null, e, new Random(0)).stream().map(input -> transform(input, transform)).forEach(faceQ::add); } // Add island quads - genBuilder.addAll(island.getQuads(null, null, 0)); - for(EnumFacing e : EnumFacing.VALUES) { - faceQuads.get(e).addAll(island.getQuads(null, e, 0)); + genBuilder.addAll(island.getQuads(null, null, new Random(0))); + for(EnumFacing e : EnumFacing.BY_INDEX) { + faceQuads.get(e).addAll(island.getQuads(null, e, new Random(0))); } genQuads = genBuilder.build(); } // Forward all to flower model - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { return face == null ? genQuads : faceQuads.get(face); } @Override public boolean isAmbientOcclusion() { @@ -200,21 +202,21 @@ public class FloatingFlowerModel implements IBakedModel { @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return flower.getItemCameraTransforms(); } - @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; } @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { Pair pair = island.handlePerspective(cameraTransformType); if(pair != null && pair.getRight() != null) return Pair.of(this, pair.getRight()); - return Pair.of(this, TRSRTransformation.identity().getMatrix()); + return Pair.of(this, TRSRTransformation.identity().getMatrixVec()); } } - private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + private final ItemOverrideList itemHandler = new ItemOverrideList() { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { + public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { // Items always have GRASS island IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; ResourceLocation identifier; diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 1eed1fe7f..85237edd3 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -32,6 +32,7 @@ import java.util.EnumMap; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.stream.Collectors; public class GunModel implements IBakedModel { @@ -42,13 +43,13 @@ public class GunModel implements IBakedModel { this.originalModel = Preconditions.checkNotNull(originalModel); } - private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { + private final ItemOverrideList itemHandler = new ItemOverrideList() { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { + public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) { ItemStack lens = ItemManaGun.getLens(stack); if(!lens.isEmpty()) { - IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); + IBakedModel lensModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(lens); return GunModel.this.getModel(lensModel); } else return GunModel.this; @@ -61,7 +62,7 @@ public class GunModel implements IBakedModel { return itemHandler; } - @Nonnull @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { return originalModel.getQuads(state, side, rand); } + @Nonnull @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, @Nonnull Random rand) { return originalModel.getQuads(state, side, rand); } @Override public boolean isAmbientOcclusion() { return originalModel.isAmbientOcclusion(); } @Override public boolean isGui3d() { return originalModel.isGui3d(); } @Override public boolean isBuiltInRenderer() { return originalModel.isBuiltInRenderer(); } @@ -89,7 +90,7 @@ public class GunModel implements IBakedModel { case POSITION: { float[] newData = new float[4]; Vector4f vec = new Vector4f(data); - transform.getMatrix().transform(vec); + transform.getMatrixVec().transform(vec); vec.get(newData); parent.put(element, newData); break; @@ -117,29 +118,29 @@ public class GunModel implements IBakedModel { ImmutableList.Builder genBuilder = ImmutableList.builder(); final TRSRTransformation transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(-0.4F, 0.25F, 0), null, new Vector3f(0.625F, 0.625F, 0.625F), TRSRTransformation.quatFromXYZ(0, (float) Math.PI / 2, 0))); - for(EnumFacing e : EnumFacing.VALUES) + for(EnumFacing e : EnumFacing.BY_INDEX) faceQuads.put(e, new ArrayList<>()); // Add lens quads, scaled and translated - for(BakedQuad quad : lens.getQuads(null, null, 0)) { + for(BakedQuad quad : lens.getQuads(null, null, new Random(0))) { genBuilder.add(transform(quad, transform)); } - for(EnumFacing e : EnumFacing.VALUES) { - faceQuads.get(e).addAll(lens.getQuads(null, e, 0).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); + for(EnumFacing e : EnumFacing.BY_INDEX) { + faceQuads.get(e).addAll(lens.getQuads(null, e, new Random(0)).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add gun quads - genBuilder.addAll(gun.getQuads(null, null, 0)); - for(EnumFacing e : EnumFacing.VALUES) { - faceQuads.get(e).addAll(gun.getQuads(null, e, 0)); + genBuilder.addAll(gun.getQuads(null, null, new Random(0))); + for(EnumFacing e : EnumFacing.BY_INDEX) { + faceQuads.get(e).addAll(gun.getQuads(null, e, new Random(0))); } genQuads = genBuilder.build(); } - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { return face == null ? genQuads : faceQuads.get(face); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { return face == null ? genQuads : faceQuads.get(face); } // Forward all to gun model @Override public boolean isAmbientOcclusion() { return gun.isAmbientOcclusion(); } @@ -147,14 +148,14 @@ public class GunModel implements IBakedModel { @Override public boolean isBuiltInRenderer() { return gun.isBuiltInRenderer(); } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return gun.getParticleTexture();} @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return gun.getItemCameraTransforms(); } - @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; } @Override public Pair handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType) { Pair pair = gun.handlePerspective(cameraTransformType); if(pair != null && pair.getRight() != null) return Pair.of(this, pair.getRight()); - return Pair.of(this, TRSRTransformation.identity().getMatrix()); + return Pair.of(this, TRSRTransformation.identity().getMatrixVec()); } } diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 1b2b573f2..e3aa54fc0 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -16,6 +16,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import java.util.List; +import java.util.Random; public class LexiconModel implements IBakedModel { private final ModelResourceLocation path2D; @@ -31,15 +32,15 @@ public class LexiconModel implements IBakedModel { || cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND) && ConfigHandler.lexicon3dModel) return Pair.of(this, null); - IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path2D); + IBakedModel original = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path2D); return original.handlePerspective(cameraTransformType); } - @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { return ImmutableList.of(); } + @Nonnull @Override public List getQuads(IBlockState state, EnumFacing side, @Nonnull Random rand) { return ImmutableList.of(); } @Override public boolean isAmbientOcclusion() { return false; } @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } - @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } + @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getInstance().getTextureMap().getAtlasSprite("botania:items/lexicon"); } @SuppressWarnings("deprecation") @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; } } diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index 88ea37114..a6daa6bf4 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelAvatar extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 735070e0f..32e2b2ac1 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -10,9 +10,9 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelBellows extends ModelBase { @@ -48,15 +48,15 @@ public class ModelBellows extends ModelBase { //float fract = Math.max(0.1F, (float) (Math.sin(((double) ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.5F); float mov = (1F - fract) * 0.5F; - GlStateManager.translate(0F, mov, 0F); + GlStateManager.translatef(0F, mov, 0F); top.render(f5); - GlStateManager.translate(0F, -mov, 0F); + GlStateManager.translatef(0F, -mov, 0F); - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(-0.19F, -1.375F, -0.19F); - GlStateManager.scale(1F, fract, 1F); + GlStateManager.rotatef(180F, 1F, 0F, 0F); + GlStateManager.translatef(-0.19F, -1.375F, -0.19F); + GlStateManager.scalef(1F, fract, 1F); funnel.render(f5); - GlStateManager.scale(1F, 1F / fract, 1F); + GlStateManager.scalef(1F, 1F / fract, 1F); } diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index b0b2e94d0..4f0b06f9f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -10,9 +10,9 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import vazkii.botania.client.render.tile.RenderTileBrewery; public class ModelBrewery extends ModelBase { @@ -53,22 +53,22 @@ public class ModelBrewery extends ModelBase { float deg = (float) time / 16F; float polerot = -deg * 25F; - GlStateManager.translate(0F, offset, 0F); - GlStateManager.rotate(polerot, 0F, 1F, 0F); + GlStateManager.translatef(0F, offset, 0F); + GlStateManager.rotatef(polerot, 0F, 1F, 0F); if(hasTile && !render.brewery.getItemHandler().getStackInSlot(0).isEmpty()) { - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(0, -0.45, 0); + GlStateManager.rotatef(180F, 1F, 0F, 0F); + GlStateManager.translatef(0, -0.45F, 0); //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(0)); //GlStateManager.translate(1F / 8F, 0.5F, -1F / 128F); - GlStateManager.translate(0, 0.45, 0); - GlStateManager.rotate(-180F, 1F, 0F, 0F); + GlStateManager.translatef(0, 0.45F, 0); + GlStateManager.rotatef(-180F, 1F, 0F, 0F); } pole.render(f); top.render(f); bottom.render(f); - GlStateManager.rotate(-polerot, 0F, 1F, 0F); + GlStateManager.rotatef(-polerot, 0F, 1F, 0F); float degper = (float) (2F * Math.PI) / plates; for(int i = 0; i < plates; i++) { @@ -77,28 +77,28 @@ public class ModelBrewery extends ModelBase { if(time == -1) offset1 = 0F; - GlStateManager.translate(0F, offset1, 0F); + GlStateManager.translatef(0F, offset1, 0F); if(hasTile && !render.brewery.getItemHandler().getStackInSlot(i + 1).isEmpty()) { float rot = plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; float transZ = 0.1245F; - GlStateManager.rotate(rot, 0F, 1F, 0F); - GlStateManager.translate(transX, transY, transZ); - GlStateManager.rotate(-90F, 1F, 0F, 0F); - GlStateManager.translate(0.125, 0.125, 0); + GlStateManager.rotatef(rot, 0F, 1F, 0F); + GlStateManager.translatef(transX, transY, transZ); + GlStateManager.rotatef(-90F, 1F, 0F, 0F); + GlStateManager.translatef(0.125F, 0.125F, 0); render.renderItemStack(render.brewery.getItemHandler().getStackInSlot(i + 1)); - GlStateManager.translate(-0.125, -0.125, 0); - GlStateManager.rotate(90F, 1F, 0F, 0F); - GlStateManager.translate(-transX, -transY, -transZ); - GlStateManager.rotate(-rot, 0F, 1F, 0F); + GlStateManager.translatef(-0.125F, -0.125F, 0); + GlStateManager.rotatef(90F, 1F, 0F, 0F); + GlStateManager.translatef(-transX, -transY, -transZ); + GlStateManager.rotatef(-rot, 0F, 1F, 0F); } plate.render(f); - GlStateManager.translate(0F, -offset1, 0F); + GlStateManager.translatef(0F, -offset1, 0F); deg += degper; } - GlStateManager.translate(0F, -offset, 0F); + GlStateManager.translatef(0F, -offset, 0F); } } diff --git a/src/main/java/vazkii/botania/client/model/ModelCloak.java b/src/main/java/vazkii/botania/client/model/ModelCloak.java index 83b6982eb..b8f4f6eac 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCloak.java +++ b/src/main/java/vazkii/botania/client/model/ModelCloak.java @@ -1,7 +1,7 @@ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; /** * armor_cloak - wiiv diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index dbf5386c6..4b9d18945 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -10,9 +10,9 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import org.lwjgl.opengl.GL11; import java.awt.Color; @@ -78,12 +78,12 @@ public class ModelHourglass extends ModelBase { if(fract1 > 0) { GlStateManager.pushMatrix(); if(flip) - GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f); + GlStateManager.translatef(-2.0F * f, 1.0F * f, -2.0F * f); else { - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f); + GlStateManager.rotatef(180F, 0F, 0F, 1F); + GlStateManager.translatef(-2.0F * f, -5.0F * f, -2.0F * f); } - GlStateManager.scale(1F, fract1, 1F); + GlStateManager.scalef(1F, fract1, 1F); sandT.render(f); GlStateManager.popMatrix(); } @@ -91,12 +91,12 @@ public class ModelHourglass extends ModelBase { if(fract2 > 0) { GlStateManager.pushMatrix(); if(flip) - GlStateManager.translate(-2.0F * f, -5.0F * f, -2.0F * f); + GlStateManager.translatef(-2.0F * f, -5.0F * f, -2.0F * f); else { - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.translate(-2.0F * f, 1.0F * f, -2.0F * f); + GlStateManager.rotatef(180F, 0F, 0F, 1F); + GlStateManager.translatef(-2.0F * f, 1.0F * f, -2.0F * f); } - GlStateManager.scale(1F, fract2, 1F); + GlStateManager.scalef(1F, fract2, 1F); sandB.render(f); GlStateManager.popMatrix(); } diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index 913884090..8c88e03cc 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java b/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java index 9ce3e23ee..6be4ebfe3 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelPylonGaia extends ModelBase implements IPylonModel { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java index b84d33d15..f4d7c17ba 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelPylonMana extends ModelBase implements IPylonModel { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java b/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java index fd562619e..54c740fad 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelPylonNatura extends ModelBase implements IPylonModel { diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index d251c3857..0e360ccda 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -10,10 +10,10 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -40,7 +40,7 @@ public class ModelSpinningCubes extends ModelBase { float offsetPerCube = 360 / cubes; GlStateManager.pushMatrix(); - GlStateManager.translate(-0.025F, 0.85F, -0.025F); + GlStateManager.translatef(-0.025F, 0.85F, -0.025F); for(int i = 0; i < cubes; i++) { float offset = offsetPerCube * i; float deg = (int) (ticks / rotationModifier % 360F + offset); @@ -52,18 +52,18 @@ public class ModelSpinningCubes extends ModelBase { float y = (float) Math.cos((ticks + 50 * i) / 5F) / 10F; GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, z); + GlStateManager.translatef(x, y, z); float xRotate = (float) Math.sin(ticks * rotationModifier) / 2F; float yRotate = (float) Math.max(0.6F, Math.sin(ticks * 0.1F) / 2F + 0.5F); float zRotate = (float) Math.cos(ticks * rotationModifier) / 2F; - GlStateManager.rotate(deg, xRotate, yRotate, zRotate); + GlStateManager.rotatef(deg, xRotate, yRotate, zRotate); if(repeat < origRepeat) { - GlStateManager.color(1F, 1F, 1F, (float) repeat / (float) origRepeat * 0.4F); + GlStateManager.color4f(1F, 1F, 1F, (float) repeat / (float) origRepeat * 0.4F); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.disableAlpha(); - } else GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.disableAlphaTest(); + } else GlStateManager.color4f(1F, 1F, 1F, 1F); int light = 15728880; int lightmapX = light % 65536; @@ -74,7 +74,7 @@ public class ModelSpinningCubes extends ModelBase { if(repeat < origRepeat) { GlStateManager.disableBlend(); - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/model/ModelSpreader.java b/src/main/java/vazkii/botania/client/model/ModelSpreader.java index 0e77f70c0..30bf3236f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpreader.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpreader.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelSpreader extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index 674139255..8226f2b17 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -11,8 +11,8 @@ package vazkii.botania.client.model; import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelTeruTeruBozu extends ModelBase { @@ -43,7 +43,7 @@ public class ModelTeruTeruBozu extends ModelBase { public void render() { float f5 = 1F / 16F; - if(Minecraft.getMinecraft().world.isRaining()) + if(Minecraft.getInstance().world.isRaining()) sadFace.render(f5); else happyFace.render(f5); thread.render(f5); diff --git a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java index 999ed930a..39fab815a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java +++ b/src/main/java/vazkii/botania/client/model/ModelTinyPotato.java @@ -10,8 +10,8 @@ */ package vazkii.botania.client.model; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBase; +import net.minecraft.client.renderer.entity.model.ModelRenderer; public class ModelTinyPotato extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index d78eeeb54..d22580741 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -17,12 +17,13 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.fluid.IFluidState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.WorldType; import net.minecraft.world.biome.Biome; import net.minecraftforge.client.MinecraftForgeClient; @@ -35,6 +36,7 @@ import vazkii.botania.common.block.tile.TileCamo; import javax.annotation.Nonnull; import java.util.List; +import java.util.Random; public class PlatformModel implements IBakedModel { private final IBakedModel original; @@ -45,12 +47,12 @@ public class PlatformModel implements IBakedModel { @Nonnull @Override - public List getQuads(IBlockState state, EnumFacing side, long rand) { + public List getQuads(IBlockState state, EnumFacing side, Random rand) { if(state == null) return ImmutableList.of(); if(!(state.getBlock() instanceof BlockPlatform)) - return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, side, rand); + return Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, side, rand); BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); if(layer == null) { @@ -58,14 +60,14 @@ public class PlatformModel implements IBakedModel { } IBlockState heldState = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_STATE); - IBlockAccess heldWorld = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_WORLD); + IBlockReader heldWorld = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_WORLD); BlockPos heldPos = ((IExtendedBlockState) state).getValue(BotaniaStateProps.HELD_POS); if (heldWorld == null || heldPos == null) { return ImmutableList.of(); } - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc = Minecraft.getInstance(); if(heldState == null && layer == BlockRenderLayer.SOLID) { // No camo return original.getQuads(state, side, rand); @@ -76,13 +78,11 @@ public class PlatformModel implements IBakedModel { return ImmutableList.of(); if(heldState.getBlock().canRenderInLayer(heldState, layer)) { - IBlockState actual = heldState.getBlock().getActualState(heldState, new FakeBlockAccess(heldWorld), heldPos); - // Steal camo's model - IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModelForState(actual); + IBakedModel model = mc.getBlockRendererDispatcher().getBlockModelShapes().getModel(heldState); // Their model can be smart too - IBlockState extended = heldState.getBlock().getExtendedState(actual, new FakeBlockAccess(heldWorld), heldPos); + IBlockState extended = heldState.getBlock().getExtendedState(heldState, new FakeBlockAccess(heldWorld), heldPos); return model.getQuads(extended, side, rand); } } @@ -107,11 +107,11 @@ public class PlatformModel implements IBakedModel { return original.getOverrides(); } - private static class FakeBlockAccess implements IBlockAccess { + private static class FakeBlockAccess implements IBlockReader { - private final IBlockAccess compose; + private final IBlockReader compose; - private FakeBlockAccess(IBlockAccess compose) { + private FakeBlockAccess(IBlockReader compose) { this.compose = compose; } @@ -120,11 +120,6 @@ public class PlatformModel implements IBakedModel { return compose.getTileEntity(pos); } - @Override - public int getCombinedLight(@Nonnull BlockPos pos, int lightValue) { - return 15 << 20 | 15 << 4; - } - @Nonnull @Override public IBlockState getBlockState(@Nonnull BlockPos pos) { @@ -135,31 +130,10 @@ public class PlatformModel implements IBakedModel { return state == null ? Blocks.AIR.getDefaultState() : state; } - @Override - public boolean isAirBlock(@Nonnull BlockPos pos) { - return compose.isAirBlock(pos); - } - @Nonnull @Override - public Biome getBiome(@Nonnull BlockPos pos) { - return compose.getBiome(pos); - } - - @Override - public int getStrongPower(@Nonnull BlockPos pos, @Nonnull EnumFacing direction) { - return compose.getStrongPower(pos, direction); - } - - @Nonnull - @Override - public WorldType getWorldType() { - return compose.getWorldType(); - } - - @Override - public boolean isSideSolid(@Nonnull BlockPos pos, @Nonnull EnumFacing side, boolean _default) { - return compose.isSideSolid(pos, side, _default); + public IFluidState getFluidState(@Nonnull BlockPos pos) { + return compose.getFluidState(pos); } } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 995160d8f..7bd55d3a7 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -15,6 +15,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IUnbakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -50,7 +51,7 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -public class SpecialFlowerModel implements IModel { +public class SpecialFlowerModel implements IUnbakedModel { private static final ModelResourceLocation MISSING = new ModelResourceLocation("builtin/missing", "missing"); private final ModelResourceLocation baseModel; private final ImmutableMap blockModels; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java index bd4c3e355..e5214c61d 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java @@ -1,7 +1,7 @@ package vazkii.botania.client.model.armor; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelBiped; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index a4d9e8e5e..1778d962a 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -12,7 +12,7 @@ package vazkii.botania.client.model.armor; import javax.annotation.Nonnull; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 567e6d4cd..01b3886e2 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -12,7 +12,7 @@ package vazkii.botania.client.model.armor; import javax.annotation.Nonnull; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index b612caa3e..2bb388449 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -12,7 +12,7 @@ package vazkii.botania.client.model.armor; import javax.annotation.Nonnull; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 7daab5606..61e827f27 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -12,7 +12,7 @@ package vazkii.botania.client.model.armor; import javax.annotation.Nonnull; -import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.inventory.EntityEquipmentSlot; diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index c186a1eb5..431bf2909 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -1,10 +1,10 @@ package vazkii.botania.client.render.entity; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.layers.LayerRenderer; +import net.minecraft.client.renderer.entity.model.ModelRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; @@ -27,7 +27,7 @@ public class LayerGaiaHead implements LayerRenderer { // Copied from LayerCustomHead, edits noted @Override - public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + public void render(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); if (!itemstack.isEmpty() && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head @@ -36,7 +36,7 @@ public class LayerGaiaHead implements LayerRenderer { if (player.isSneaking()) { - GlStateManager.translate(0.0F, 0.2F, 0.0F); + GlStateManager.translatef(0.0F, 0.2F, 0.0F); } /*boolean flag = player instanceof EntityVillager || player instanceof EntityZombie && ((EntityZombie)player).isVillager(); @@ -51,10 +51,10 @@ public class LayerGaiaHead implements LayerRenderer { } Botania - N/A */ modelRenderer.postRender(0.0625F); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); float f2 = 1.1875F; - GlStateManager.scale(f2, -f2, -f2); + GlStateManager.scalef(f2, -f2, -f2); // Botania - remove if check for skull and else branch. Check done above. @@ -87,8 +87,8 @@ public class LayerGaiaHead implements LayerRenderer { // Botania - use gaia TESR ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback); - ((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class)) - .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), null, -1, limbSwing); + ((RenderTileGaiaHead) (TileEntityRenderer) TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class)) + .renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, 0, null, -1, limbSwing); ShaderHelper.releaseShader(); GlStateManager.popMatrix();