From 4ed17950b9fdeab7f6b9270f531f37584e3f5be2 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 9 Jan 2016 17:53:06 +0100 Subject: [PATCH] Removed TESRs for the most part and added a "not complete"-disclaimer for the upcoming 1.8.9 beta releases ~ --- .../mod/blocks/render/RenderLaserRelay.java | 61 ------ .../render/RenderReconstructorLens.java | 11 +- .../mod/blocks/render/RenderSmileyCloud.java | 28 +-- .../mod/blocks/render/RenderTileEntity.java | 58 ------ .../mod/blocks/render/model/ModelBaseAA.java | 33 ---- .../render/model/ModelBookletStand.java | 115 ----------- .../render/model/ModelCoffeeMachine.java | 151 -------------- .../mod/blocks/render/model/ModelCompost.java | 20 +- .../blocks/render/model/ModelFishingNet.java | 119 ----------- .../render/model/ModelFurnaceSolar.java | 36 ---- .../blocks/render/model/ModelLaserRelay.java | 187 ------------------ .../render/model/ModelPhantomBooster.java | 163 --------------- .../blocks/render/model/ModelSmileyCloud.java | 171 ---------------- .../mod/booklet/BookletUtils.java | 3 + .../mod/booklet/InitBooklet.java | 8 +- .../mod/booklet/button/IndexButton.java | 10 + .../mod/booklet/chapter/BookletChapter.java | 7 + .../mod/proxy/ClientProxy.java | 12 +- .../assets/actuallyadditions/lang/en_US.lang | 1 + 19 files changed, 44 insertions(+), 1150 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java deleted file mode 100644 index 1df707eaf..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderLaserRelay.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file ("RenderLaserRelay.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render; - -import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.tileentity.TileEntity; - - -public class RenderLaserRelay extends RenderTileEntity{ - - public RenderLaserRelay(ModelBaseAA model){ - super(model); - } - - @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){ - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.translate(0.0F, -2.0F, 0.0F); - this.bindTexture(resLoc); - - int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld()); - if(meta == 0){ - GlStateManager.rotate(180F, 1F, 0F, 0F); - GlStateManager.translate(0F, -2F, 0F); - } - else if(meta == 3){ - GlStateManager.rotate(-90, 1F, 0F, 0F); - GlStateManager.translate(0F, -1F, 1F); - } - else if(meta == 2){ - GlStateManager.rotate(90, 1F, 0F, 0F); - GlStateManager.translate(0F, -1F, -1F); - } - else if(meta == 4){ - GlStateManager.rotate(90, 0F, 0F, 1F); - GlStateManager.translate(1F, -1F, 0F); - } - else if(meta == 5){ - GlStateManager.rotate(90, 0F, 0F, -1F); - GlStateManager.translate(-1F, -1F, 0F); - } - - GlStateManager.scale(0.85F, 0.85F, 0.85F); - GlStateManager.translate(0F, 0.2657F, 0F); - theModel.render(0.0625F); - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java index 012edb494..627119a37 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderReconstructorLens.java @@ -11,20 +11,15 @@ package de.ellpeck.actuallyadditions.mod.blocks.render; -import de.ellpeck.actuallyadditions.api.lens.ILensItem; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +//TODO Fix Reconstructor Lens rendering public class RenderReconstructorLens extends TileEntitySpecialRenderer{ @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int par6){ - if(!(tile instanceof TileEntityAtomicReconstructor)){ + /*if(!(tile instanceof TileEntityAtomicReconstructor)){ return; } ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0); @@ -66,6 +61,6 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{ AssetUtil.renderItemInWorld(stack); GlStateManager.popMatrix(); - } + }*/ } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java index 180784f49..36ded7504 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java @@ -10,30 +10,17 @@ package de.ellpeck.actuallyadditions.mod.blocks.render; -import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; -import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg; -import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs; -import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; -import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -public class RenderSmileyCloud extends RenderTileEntity{ +//TODO Fix Smiley Cloud +public class RenderSmileyCloud extends TileEntitySpecialRenderer{ - private static final ResourceLocation resLocValentine = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/modelPinkFluffyUnicloud.png"); - - public RenderSmileyCloud(ModelBaseAA model){ - super(model); - } + //private static final ResourceLocation resLocValentine = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/modelPinkFluffyUnicloud.png"); @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int partial){ - if(!(tile instanceof TileEntitySmileyCloud)){ + /*if(!(tile instanceof TileEntitySmileyCloud)){ return; } TileEntitySmileyCloud theCloud = (TileEntitySmileyCloud)tile; @@ -122,7 +109,7 @@ public class RenderSmileyCloud extends RenderTileEntity{ GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); //TODO Fix nameplate with Smiley Cloud - /*Tessellator tessellator = Tessellator.getInstance(); + Tessellator tessellator = Tessellator.getInstance(); GlStateManager.glDisable(GlStateManager.GL_TEXTURE_2D); tessellator.startDrawingQuads(); int i = Minecraft.getMinecraft().fontRendererObj.getStringWidth(theCloud.name)/2; @@ -132,7 +119,7 @@ public class RenderSmileyCloud extends RenderTileEntity{ tessellator.addVertex(i+1, 8.0D, 0.0D); tessellator.addVertex(i+1, -1.0D, 0.0D); tessellator.draw(); - GlStateManager.glEnable(GlStateManager.GL_TEXTURE_2D);*/ + GlStateManager.glEnable(GlStateManager.GL_TEXTURE_2D); GlStateManager.depthMask(true); Minecraft.getMinecraft().fontRendererObj.drawString(theCloud.name, -Minecraft.getMinecraft().fontRendererObj.getStringWidth(theCloud.name)/2, 0, StringUtil.DECIMAL_COLOR_WHITE); @@ -146,6 +133,7 @@ public class RenderSmileyCloud extends RenderTileEntity{ } } GlStateManager.popMatrix(); + */ } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java deleted file mode 100644 index fa0e46756..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderTileEntity.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file ("RenderTileEntity.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render; - -import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; -import de.ellpeck.actuallyadditions.mod.util.PosUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -public class RenderTileEntity extends TileEntitySpecialRenderer{ - - public ModelBaseAA theModel; - public ResourceLocation resLoc; - - public RenderTileEntity(ModelBaseAA model){ - this.theModel = model; - this.resLoc = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/"+this.theModel.getName()+".png"); - } - - @Override - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float par5, int i){ - GlStateManager.pushMatrix(); - GlStateManager.translate((float)x+0.5F, (float)y-0.5F, (float)z+0.5F); - GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F); - GlStateManager.translate(0.0F, -2.0F, 0.0F); - this.bindTexture(resLoc); - - if(theModel.doesRotate()){ - int meta = PosUtil.getMetadata(tile.getPos(), tile.getWorld()); - if(meta == 0){ - GlStateManager.rotate(180F, 0F, 1F, 0F); - } - if(meta == 1){ - GlStateManager.rotate(90F, 0F, 1F, 0F); - } - if(meta == 3){ - GlStateManager.rotate(270F, 0F, 1F, 0F); - } - } - - theModel.render(0.0625F); - theModel.renderExtra(0.0625F, tile); - - GlStateManager.popMatrix(); - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java deleted file mode 100644 index 3596c5699..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file ("ModelBaseAA.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.tileentity.TileEntity; - -public class ModelBaseAA extends ModelBase{ - - public void render(float f){ - - } - - public String getName(){ - return null; - } - - public void renderExtra(float f, TileEntity tile){ - - } - - public boolean doesRotate(){ - return false; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java deleted file mode 100644 index dd369ab4d..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file ("ModelBookletStand.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; - -public class ModelBookletStand extends ModelBaseAA{ - - ModelRenderer body1; - ModelRenderer bottom1; - ModelRenderer bottom2; - ModelRenderer body2; - ModelRenderer body3; - ModelRenderer book1; - ModelRenderer book2; - ModelRenderer book3; - ModelRenderer book4; - - public ModelBookletStand(){ - textureWidth = 64; - textureHeight = 64; - - body1 = new ModelRenderer(this, 0, 0); - body1.addBox(0F, 0F, 0F, 14, 8, 1); - body1.setRotationPoint(-7F, 17F, 1F); - body1.setTextureSize(64, 64); - body1.mirror = true; - setRotation(body1, -0.7853982F, 0F, 0F); - bottom1 = new ModelRenderer(this, 25, 6); - bottom1.addBox(0F, 0F, 0F, 1, 1, 8); - bottom1.setRotationPoint(-5F, 23F, -5F); - bottom1.setTextureSize(64, 64); - bottom1.mirror = true; - setRotation(bottom1, 0F, 0F, 0F); - bottom2 = new ModelRenderer(this, 25, 6); - bottom2.addBox(0F, 0F, 0F, 1, 1, 8); - bottom2.setRotationPoint(4F, 23F, -5F); - bottom2.setTextureSize(64, 64); - bottom2.mirror = true; - setRotation(bottom2, 0F, 0F, 0F); - body2 = new ModelRenderer(this, 0, 10); - body2.addBox(0F, 0F, 0F, 14, 1, 2); - body2.setRotationPoint(-7F, 20.91F, -5F); - body2.setTextureSize(64, 64); - body2.mirror = true; - setRotation(body2, -0.7853982F, 0F, 0F); - body3 = new ModelRenderer(this, 0, 14); - body3.addBox(0F, 0F, 0F, 10, 3, 1); - body3.setRotationPoint(-5F, 20F, -1F); - body3.setTextureSize(64, 64); - body3.mirror = true; - setRotation(body3, 0F, 0F, 0F); - book1 = new ModelRenderer(this, 36, 0); - book1.addBox(0F, 0F, 0F, 8, 10, 0); - book1.setRotationPoint(0F, 15F, 3.1F); - book1.setTextureSize(64, 64); - book1.mirror = true; - setRotation(book1, -0.837758F, 0.0872665F, 0F); - book2 = new ModelRenderer(this, 36, 0); - book2.addBox(0F, 0F, 0F, 8, 10, 0); - book2.setRotationPoint(-8F, 15F, 3.1F); - book2.setTextureSize(64, 64); - book2.mirror = true; - setRotation(book2, -0.837758F, 0F, 0F); - book3 = new ModelRenderer(this, 0, 19); - book3.addBox(0F, 0F, 0F, 7, 8, 1); - book3.setRotationPoint(7F, 16F, 1.2F); - book3.setTextureSize(64, 64); - book3.mirror = true; - setRotation(book3, 0.837758F, -3.054326F, 0F); - book4 = new ModelRenderer(this, 0, 19); - book4.addBox(0F, 0F, 0F, 7, 8, 1); - book4.setRotationPoint(-7F, 15.3F, 1.2F); - book4.setTextureSize(64, 64); - book4.mirror = true; - setRotation(book4, -0.837758F, 0F, 0F); - } - - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override - public void render(float f){ - body1.render(f); - bottom1.render(f); - bottom2.render(f); - body2.render(f); - body3.render(f); - book1.render(f); - book2.render(f); - book3.render(f); - book4.render(f); - } - - @Override - public String getName(){ - return "modelBookletStand"; - } - - @Override - public boolean doesRotate(){ - return true; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java deleted file mode 100644 index 858e5a85d..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * This file ("ModelCoffeeMachine.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; - -/** - * Made by Canitzp. - * Thanks. - */ -public class ModelCoffeeMachine extends ModelBaseAA{ - - ModelRenderer p1; - ModelRenderer p2; - ModelRenderer p3; - ModelRenderer p4; - ModelRenderer p5; - ModelRenderer p6; - ModelRenderer p7; - ModelRenderer p8; - ModelRenderer p9; - ModelRenderer p10; - ModelRenderer p11; - ModelRenderer p12; - ModelRenderer p13; - - public ModelCoffeeMachine(){ - textureWidth = 128; - textureHeight = 128; - - p1 = new ModelRenderer(this, 0, 0); - p1.addBox(0F, 0F, 0F, 10, 1, 14); - p1.setRotationPoint(-5F, 23F, -7F); - p1.setTextureSize(128, 128); - p1.mirror = true; - setRotation(p1, 0F, 0F, 0F); - p2 = new ModelRenderer(this, 49, 0); - p2.addBox(0F, 0F, 0F, 10, 8, 6); - p2.setRotationPoint(-5F, 15F, 1F); - p2.setTextureSize(128, 128); - p2.mirror = true; - setRotation(p2, 0F, 0F, 0F); - p3 = new ModelRenderer(this, 0, 16); - p3.addBox(0F, 0F, 0F, 10, 2, 11); - p3.setRotationPoint(-5F, 13F, -4F); - p3.setTextureSize(128, 128); - p3.mirror = true; - setRotation(p3, 0F, 0F, 0F); - p4 = new ModelRenderer(this, 43, 16); - p4.addBox(0F, 0F, 0F, 8, 3, 8); - p4.setRotationPoint(-4F, 10F, -1F); - p4.setTextureSize(128, 128); - p4.mirror = true; - setRotation(p4, 0F, 0F, 0F); - p5 = new ModelRenderer(this, 0, 30); - p5.addBox(0F, 0F, 0F, 2, 1, 2); - p5.setRotationPoint(-1F, 15F, -3.5F); - p5.setTextureSize(128, 128); - p5.mirror = true; - setRotation(p5, 0F, 0F, 0F); - p6 = new ModelRenderer(this, 82, 0); - p6.addBox(0F, 0F, 0F, 4, 5, 1); - p6.setRotationPoint(-2F, 17F, -1F); - p6.setTextureSize(128, 128); - p6.mirror = true; - setRotation(p6, 0F, 0F, 0F); - p7 = new ModelRenderer(this, 82, 0); - p7.addBox(0F, 0F, 0F, 4, 5, 1); - p7.setRotationPoint(-2F, 17F, -6F); - p7.setTextureSize(128, 128); - p7.mirror = true; - setRotation(p7, 0F, 0F, 0F); - p8 = new ModelRenderer(this, 82, 0); - p8.addBox(0F, 0F, 0F, 4, 5, 1); - p8.setRotationPoint(2F, 17F, -1F); - p8.setTextureSize(128, 128); - p8.mirror = true; - setRotation(p8, 0F, 1.570796F, 0F); - p9 = new ModelRenderer(this, 82, 0); - p9.addBox(0F, 0F, 0F, 4, 5, 1); - p9.setRotationPoint(-3F, 17F, -1F); - p9.setTextureSize(128, 128); - p9.mirror = true; - setRotation(p9, 0F, 1.570796F, 0F); - p10 = new ModelRenderer(this, 93, 0); - p10.addBox(0F, 0F, 0F, 4, 1, 4); - p10.setRotationPoint(-2F, 22F, -5F); - p10.setTextureSize(128, 128); - p10.mirror = true; - setRotation(p10, 0F, 0F, 0F); - p11 = new ModelRenderer(this, 82, 7); - p11.addBox(0F, 0F, 0F, 1, 1, 2); - p11.setRotationPoint(-4F, 18F, -4F); - p11.setTextureSize(128, 128); - p11.mirror = true; - setRotation(p11, 0F, 0F, 0F); - p12 = new ModelRenderer(this, 82, 7); - p12.addBox(0F, 0F, 0F, 1, 1, 2); - p12.setRotationPoint(-4F, 21F, -4F); - p12.setTextureSize(128, 128); - p12.mirror = true; - setRotation(p12, 0F, 0F, 0F); - p13 = new ModelRenderer(this, 89, 7); - p13.addBox(0F, 0F, 0F, 1, 2, 2); - p13.setRotationPoint(-5F, 19F, -4F); - p13.setTextureSize(128, 128); - p13.mirror = true; - setRotation(p13, 0F, 0F, 0F); - } - - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override - public void render(float f){ - p1.render(f); - p2.render(f); - p3.render(f); - p4.render(f); - p5.render(f); - p6.render(f); - p7.render(f); - p8.render(f); - p9.render(f); - p10.render(f); - p11.render(f); - p12.render(f); - p13.render(f); - } - - @Override - public String getName(){ - return "modelCoffeeMachine"; - } - - @Override - public boolean doesRotate(){ - return true; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java index 9804bf28d..685bbff99 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java @@ -10,17 +10,12 @@ package de.ellpeck.actuallyadditions.mod.blocks.render.model; -import de.ellpeck.actuallyadditions.mod.items.InitItems; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost; -import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; +import net.minecraft.client.model.ModelBase; -public class ModelCompost extends ModelBaseAA{ +//TODO Fix compost rendering +public class ModelCompost extends ModelBase{ - public ModelRenderer floor; + /*public ModelRenderer floor; public ModelRenderer wallOne; public ModelRenderer wallTwo; public ModelRenderer wallThree; @@ -67,11 +62,6 @@ public class ModelCompost extends ModelBaseAA{ this.floor.render(f); } - @Override - public String getName(){ - return "modelCompost"; - } - @Override public void renderExtra(float f, TileEntity tile){ //Hehe @@ -95,5 +85,5 @@ public class ModelCompost extends ModelBaseAA{ } } } - } + }*/ } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java deleted file mode 100644 index a7747ea78..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * This file ("ModelFishingNet.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; - -public class ModelFishingNet extends ModelBaseAA{ - - public ModelRenderer s1; - public ModelRenderer s2; - public ModelRenderer s3; - public ModelRenderer s4; - public ModelRenderer s5; - public ModelRenderer s6; - public ModelRenderer s7; - public ModelRenderer s8; - public ModelRenderer s9; - public ModelRenderer s10; - public ModelRenderer s11; - public ModelRenderer s12; - public ModelRenderer s13; - public ModelRenderer s14; - public ModelRenderer s15; - public ModelRenderer s16; - - public ModelFishingNet(){ - this.textureWidth = 64; - this.textureHeight = 64; - this.s11 = new ModelRenderer(this, 0, 0); - this.s11.mirror = true; - this.s11.setRotationPoint(-3.5F, 23.0F, -8.0F); - this.s11.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s9 = new ModelRenderer(this, 0, 0); - this.s9.mirror = true; - this.s9.setRotationPoint(-7.5F, 23.0F, -8.0F); - this.s9.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s8 = new ModelRenderer(this, 0, 0); - this.s8.setRotationPoint(-8.0F, 23.0F, 6.5F); - this.s8.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s3 = new ModelRenderer(this, 0, 0); - this.s3.setRotationPoint(-8.0F, 23.0F, -3.5F); - this.s3.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s1 = new ModelRenderer(this, 0, 0); - this.s1.setRotationPoint(-8.0F, 23.0F, -7.5F); - this.s1.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s14 = new ModelRenderer(this, 0, 0); - this.s14.mirror = true; - this.s14.setRotationPoint(2.5F, 23.0F, -8.0F); - this.s14.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s15 = new ModelRenderer(this, 0, 0); - this.s15.mirror = true; - this.s15.setRotationPoint(4.5F, 23.0F, -8.0F); - this.s15.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s4 = new ModelRenderer(this, 0, 0); - this.s4.setRotationPoint(-8.0F, 23.0F, -1.5F); - this.s4.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s13 = new ModelRenderer(this, 0, 0); - this.s13.mirror = true; - this.s13.setRotationPoint(0.5F, 23.0F, -8.0F); - this.s13.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s5 = new ModelRenderer(this, 0, 0); - this.s5.setRotationPoint(-8.0F, 23.0F, 0.5F); - this.s5.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s6 = new ModelRenderer(this, 0, 0); - this.s6.setRotationPoint(-8.0F, 23.0F, 2.5F); - this.s6.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s12 = new ModelRenderer(this, 0, 0); - this.s12.mirror = true; - this.s12.setRotationPoint(-1.5F, 23.0F, -8.0F); - this.s12.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s16 = new ModelRenderer(this, 0, 0); - this.s16.mirror = true; - this.s16.setRotationPoint(6.5F, 23.0F, -8.0F); - this.s16.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - this.s2 = new ModelRenderer(this, 0, 0); - this.s2.setRotationPoint(-8.0F, 23.0F, -5.5F); - this.s2.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s7 = new ModelRenderer(this, 0, 0); - this.s7.setRotationPoint(-8.0F, 23.0F, 4.5F); - this.s7.addBox(0.0F, 0.0F, 0.0F, 16, 1, 1, 0.0F); - this.s10 = new ModelRenderer(this, 0, 0); - this.s10.mirror = true; - this.s10.setRotationPoint(-5.5F, 23.0F, -8.0F); - this.s10.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F); - } - - @Override - public void render(float f){ - this.s11.render(f); - this.s9.render(f); - this.s8.render(f); - this.s3.render(f); - this.s1.render(f); - this.s14.render(f); - this.s15.render(f); - this.s4.render(f); - this.s13.render(f); - this.s5.render(f); - this.s6.render(f); - this.s12.render(f); - this.s16.render(f); - this.s2.render(f); - this.s7.render(f); - this.s10.render(f); - } - - @Override - public String getName(){ - return "modelFishingNet"; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java deleted file mode 100644 index 2b1ad9242..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file ("ModelFurnaceSolar.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; - -public class ModelFurnaceSolar extends ModelBaseAA{ - - public ModelRenderer s; - - public ModelFurnaceSolar(){ - this.textureWidth = 64; - this.textureHeight = 32; - this.s = new ModelRenderer(this, 0, 0); - this.s.setRotationPoint(-8.0F, 21.0F, -8.0F); - this.s.addBox(0.0F, 0.0F, 0.0F, 16, 3, 16, 0.0F); - } - - @Override - public void render(float f){ - this.s.render(f); - } - - @Override - public String getName(){ - return "modelFurnaceSolar"; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java deleted file mode 100644 index d44cce4ea..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java +++ /dev/null @@ -1,187 +0,0 @@ -/* - * This file ("ModelLaserRelay.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; - -/** - * Made by Canitzp. - * Thanks. Seriously. It looks really awesome. I don't think I could do this. - */ -public class ModelLaserRelay extends ModelBaseAA{ - - ModelRenderer bottom; - ModelRenderer laserPillar; - ModelRenderer laserBase; - ModelRenderer covering1; - ModelRenderer covering2; - ModelRenderer covering3; - ModelRenderer covering4; - ModelRenderer covering5; - ModelRenderer covering6; - ModelRenderer covering7; - ModelRenderer covering8; - ModelRenderer top; - ModelRenderer covering9; - ModelRenderer covering10; - ModelRenderer covering11; - ModelRenderer covering12; - ModelRenderer energyBall; - - public ModelLaserRelay(){ - textureWidth = 64; - textureHeight = 64; - - bottom = new ModelRenderer(this, 0, 0); - bottom.addBox(0F, 0F, 0F, 8, 1, 8); - bottom.setRotationPoint(-4F, 23F, -4F); - bottom.setTextureSize(64, 64); - bottom.mirror = true; - setRotation(bottom, 0F, 0F, 0F); - laserPillar = new ModelRenderer(this, 54, 0); - laserPillar.addBox(0F, 0F, 0F, 2, 11, 2); - laserPillar.setRotationPoint(-1F, 10F, -1F); - laserPillar.setTextureSize(64, 64); - laserPillar.mirror = true; - setRotation(laserPillar, 0F, 0F, 0F); - laserBase = new ModelRenderer(this, 33, 0); - laserBase.addBox(0F, 0F, 0F, 5, 2, 5); - laserBase.setRotationPoint(-2.5F, 21F, -2.5F); - laserBase.setTextureSize(64, 64); - laserBase.mirror = true; - setRotation(laserBase, 0F, 0F, 0F); - covering1 = new ModelRenderer(this, 0, 10); - covering1.addBox(0F, 0F, 0F, 8, 3, 1); - covering1.setRotationPoint(-4F, 20F, -5F); - covering1.setTextureSize(64, 64); - covering1.mirror = true; - setRotation(covering1, 0F, 0F, 0F); - covering2 = new ModelRenderer(this, 0, 10); - covering2.addBox(0F, 0F, 0F, 8, 3, 1); - covering2.setRotationPoint(-4F, 20F, 4F); - covering2.setTextureSize(64, 64); - covering2.mirror = true; - setRotation(covering2, 0F, 0F, 0F); - covering3 = new ModelRenderer(this, 0, 10); - covering3.addBox(0F, 0F, 0F, 8, 3, 1); - covering3.setRotationPoint(-5F, 20F, 4F); - covering3.setTextureSize(64, 64); - covering3.mirror = true; - setRotation(covering3, 0F, 1.579523F, 0F); - covering4 = new ModelRenderer(this, 0, 10); - covering4.addBox(0F, 0F, 0F, 8, 3, 1); - covering4.setRotationPoint(4F, 20F, 4F); - covering4.setTextureSize(64, 64); - covering4.mirror = true; - setRotation(covering4, 0F, 1.579523F, 0F); - covering5 = new ModelRenderer(this, 0, 10); - covering5.addBox(0F, 0F, 0F, 8, 3, 1); - covering5.setRotationPoint(-4F, 10F, -5F); - covering5.setTextureSize(64, 64); - covering5.mirror = true; - setRotation(covering5, 0F, 0F, 0F); - covering6 = new ModelRenderer(this, 0, 10); - covering6.addBox(0F, 0F, 0F, 8, 3, 1); - covering6.setRotationPoint(-4F, 10F, 4F); - covering6.setTextureSize(64, 64); - covering6.mirror = true; - setRotation(covering6, 0F, 0F, 0F); - covering7 = new ModelRenderer(this, 0, 10); - covering7.addBox(0F, 0F, 0F, 8, 3, 1); - covering7.setRotationPoint(-5F, 10F, 4F); - covering7.setTextureSize(64, 64); - covering7.mirror = true; - setRotation(covering7, 0F, 1.579523F, 0F); - covering8 = new ModelRenderer(this, 0, 10); - covering8.addBox(0F, 0F, 0F, 8, 3, 1); - covering8.setRotationPoint(4F, 10F, 4F); - covering8.setTextureSize(64, 64); - covering8.mirror = true; - setRotation(covering8, 0F, 1.579523F, 0F); - top = new ModelRenderer(this, 0, 0); - top.addBox(0F, 0F, 0F, 8, 1, 8); - top.setRotationPoint(-4F, 9F, -4F); - top.setTextureSize(64, 64); - top.mirror = true; - setRotation(top, 0F, 0F, 0F); - covering9 = new ModelRenderer(this, 19, 10); - covering9.addBox(0F, 0F, 0F, 8, 7, 1); - covering9.setRotationPoint(-4F, 13F, 5F); - covering9.setTextureSize(64, 64); - covering9.mirror = true; - setRotation(covering9, 0F, 0F, 0F); - covering10 = new ModelRenderer(this, 19, 10); - covering10.addBox(0F, 0F, 0F, 8, 7, 1); - covering10.setRotationPoint(-4F, 13F, -6F); - covering10.setTextureSize(64, 64); - covering10.mirror = true; - setRotation(covering10, 0F, 0F, 0F); - covering11 = new ModelRenderer(this, 19, 10); - covering11.addBox(0F, 0F, 0F, 8, 7, 1); - covering11.setRotationPoint(-6F, 13F, 4F); - covering11.setTextureSize(64, 64); - covering11.mirror = true; - setRotation(covering11, 0F, 1.579523F, 0F); - covering12 = new ModelRenderer(this, 19, 10); - covering12.addBox(0F, 0F, 0F, 8, 7, 1); - covering12.setRotationPoint(5F, 13F, 4F); - covering12.setTextureSize(64, 64); - covering12.mirror = true; - setRotation(covering12, 0F, 1.579523F, 0F); - energyBall = new ModelRenderer(this, 0, 15); - energyBall.addBox(0F, 0F, 0F, 3, 3, 3); - energyBall.setRotationPoint(-1.5F, 15F, -1.5F); - energyBall.setTextureSize(64, 64); - energyBall.mirror = true; - setRotation(energyBall, 0F, 0F, 0F); - } - - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override - public void render(float f){ - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - bottom.render(f); - laserPillar.render(f); - laserBase.render(f); - energyBall.render(f); - top.render(f); - covering1.render(f); - covering2.render(f); - covering3.render(f); - covering4.render(f); - covering5.render(f); - covering6.render(f); - covering7.render(f); - covering8.render(f); - covering9.render(f); - covering10.render(f); - covering11.render(f); - covering12.render(f); - } - - @Override - public String getName(){ - return "modelLaserRelay"; - } - - @Override - public boolean doesRotate(){ - return true; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java deleted file mode 100644 index b96beda9f..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * This file ("ModelPhantomBooster.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; - -public class ModelPhantomBooster extends ModelBaseAA{ - - ModelRenderer s1; - ModelRenderer s2; - ModelRenderer s3; - ModelRenderer s4; - ModelRenderer s5; - ModelRenderer s6; - ModelRenderer s7; - ModelRenderer s8; - ModelRenderer s9; - ModelRenderer s10; - ModelRenderer s11; - ModelRenderer s12; - ModelRenderer s13; - ModelRenderer s14; - ModelRenderer s15; - - public ModelPhantomBooster(){ - textureWidth = 128; - textureHeight = 128; - - s1 = new ModelRenderer(this, 0, 0); - s1.addBox(0F, 0F, 0F, 4, 16, 4); - s1.setRotationPoint(-2F, 8F, -2F); - s1.setTextureSize(128, 128); - s1.mirror = true; - setRotation(s1, 0F, 0F, 0F); - s2 = new ModelRenderer(this, 17, 0); - s2.addBox(0F, 0F, 0F, 6, 1, 6); - s2.setRotationPoint(-3F, 9F, -3F); - s2.setTextureSize(128, 128); - s2.mirror = true; - setRotation(s2, 0F, 0F, 0F); - s3 = new ModelRenderer(this, 17, 0); - s3.addBox(0F, 0F, 0F, 6, 1, 6); - s3.setRotationPoint(-3F, 22F, -3F); - s3.setTextureSize(128, 128); - s3.mirror = true; - setRotation(s3, 0F, 0F, 0F); - s4 = new ModelRenderer(this, 17, 8); - s4.addBox(0F, 0F, 0F, 6, 2, 1); - s4.setRotationPoint(-3F, 10F, -4F); - s4.setTextureSize(128, 128); - s4.mirror = true; - setRotation(s4, 0F, 0F, 0F); - s5 = new ModelRenderer(this, 17, 8); - s5.addBox(0F, 0F, 0F, 6, 2, 1); - s5.setRotationPoint(-3F, 10F, 3F); - s5.setTextureSize(128, 128); - s5.mirror = true; - setRotation(s5, 0F, 0F, 0F); - s6 = new ModelRenderer(this, 17, 8); - s6.addBox(0F, 0F, 0F, 6, 2, 1); - s6.setRotationPoint(-4F, 10F, 3F); - s6.setTextureSize(128, 128); - s6.mirror = true; - setRotation(s6, 0F, 1.579523F, 0F); - s7 = new ModelRenderer(this, 17, 8); - s7.addBox(0F, 0F, 0F, 6, 2, 1); - s7.setRotationPoint(3F, 10F, 3F); - s7.setTextureSize(128, 128); - s7.mirror = true; - setRotation(s7, 0F, 1.579523F, 0F); - s8 = new ModelRenderer(this, 17, 12); - s8.addBox(0F, 0F, 0F, 6, 8, 1); - s8.setRotationPoint(-3F, 12F, -5F); - s8.setTextureSize(128, 128); - s8.mirror = true; - setRotation(s8, 0F, 0F, 0F); - s9 = new ModelRenderer(this, 17, 12); - s9.addBox(0F, 0F, 0F, 6, 8, 1); - s9.setRotationPoint(-3F, 12F, 4F); - s9.setTextureSize(128, 128); - s9.mirror = true; - setRotation(s9, 0F, 0F, 0F); - s10 = new ModelRenderer(this, 17, 12); - s10.addBox(0F, 0F, 0F, 6, 8, 1); - s10.setRotationPoint(-5F, 12F, 3F); - s10.setTextureSize(128, 128); - s10.mirror = true; - setRotation(s10, 0F, 1.579523F, 0F); - s11 = new ModelRenderer(this, 17, 12); - s11.addBox(0F, 0F, 0F, 6, 8, 1); - s11.setRotationPoint(4F, 12F, 3F); - s11.setTextureSize(128, 128); - s11.mirror = true; - setRotation(s11, 0F, 1.579523F, 0F); - s12 = new ModelRenderer(this, 17, 8); - s12.addBox(0F, 0F, 0F, 6, 2, 1); - s12.setRotationPoint(-4F, 20F, 3F); - s12.setTextureSize(128, 128); - s12.mirror = true; - setRotation(s12, 0F, 1.579523F, 0F); - s13 = new ModelRenderer(this, 17, 8); - s13.addBox(0F, 0F, 0F, 6, 2, 1); - s13.setRotationPoint(-3F, 20F, 3F); - s13.setTextureSize(128, 128); - s13.mirror = true; - setRotation(s13, 0F, 0F, 0F); - s14 = new ModelRenderer(this, 17, 8); - s14.addBox(0F, 0F, 0F, 6, 2, 1); - s14.setRotationPoint(3F, 20F, 3F); - s14.setTextureSize(128, 128); - s14.mirror = true; - setRotation(s14, 0F, 1.579523F, 0F); - s15 = new ModelRenderer(this, 17, 8); - s15.addBox(0F, 0F, 0F, 6, 2, 1); - s15.setRotationPoint(-3F, 20F, -4F); - s15.setTextureSize(128, 128); - s15.mirror = true; - setRotation(s15, 0F, 0F, 0F); - } - - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override - public void render(float f){ - s1.render(f); - s2.render(f); - s3.render(f); - s4.render(f); - s5.render(f); - s6.render(f); - s7.render(f); - s8.render(f); - s9.render(f); - s10.render(f); - s11.render(f); - s12.render(f); - s13.render(f); - s14.render(f); - s15.render(f); - } - - @Override - public String getName(){ - return "modelPhantomBooster"; - } - - @Override - public boolean doesRotate(){ - return true; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java deleted file mode 100644 index d15218459..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * This file ("ModelSmileyCloud.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense/ - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2016 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.blocks.render.model; - -import net.minecraft.client.model.ModelRenderer; - -public class ModelSmileyCloud extends ModelBaseAA{ - - ModelRenderer s1; - ModelRenderer s2; - ModelRenderer s3; - ModelRenderer s4; - ModelRenderer s5; - ModelRenderer s6; - ModelRenderer s7; - ModelRenderer s8; - ModelRenderer s9; - ModelRenderer s10; - ModelRenderer s11; - ModelRenderer s12; - ModelRenderer s13; - ModelRenderer s14; - ModelRenderer s15; - ModelRenderer s16; - - public ModelSmileyCloud(){ - textureWidth = 64; - textureHeight = 64; - - s1 = new ModelRenderer(this, 0, 0); - s1.addBox(0F, 0F, 0F, 12, 10, 10); - s1.setRotationPoint(-6F, 14F, -4F); - s1.setTextureSize(64, 64); - s1.mirror = true; - setRotation(s1, 0F, 0F, 0F); - s2 = new ModelRenderer(this, 45, 0); - s2.addBox(0F, 0F, 0F, 1, 8, 8); - s2.setRotationPoint(-7F, 15F, -3F); - s2.setTextureSize(64, 64); - s2.mirror = true; - setRotation(s2, 0F, 0F, 0F); - s3 = new ModelRenderer(this, 45, 0); - s3.addBox(0F, 0F, 0F, 1, 8, 8); - s3.setRotationPoint(6F, 15F, -3F); - s3.setTextureSize(64, 64); - s3.mirror = true; - setRotation(s3, 0F, 0F, 0F); - s4 = new ModelRenderer(this, 0, 21); - s4.addBox(0F, 0F, 0F, 10, 8, 1); - s4.setRotationPoint(-5F, 15F, 6F); - s4.setTextureSize(64, 64); - s4.mirror = true; - setRotation(s4, 0F, 0F, 0F); - s5 = new ModelRenderer(this, 23, 27); - s5.addBox(0F, 0F, 0F, 10, 1, 8); - s5.setRotationPoint(-5F, 13F, -3F); - s5.setTextureSize(64, 64); - s5.mirror = true; - setRotation(s5, 0F, 0F, 0F); - s6 = new ModelRenderer(this, 23, 21); - s6.addBox(0F, 0F, 0F, 6, 1, 4); - s6.setRotationPoint(-3F, 12F, -1F); - s6.setTextureSize(64, 64); - s6.mirror = true; - setRotation(s6, 0F, 0F, 0F); - s7 = new ModelRenderer(this, 45, 16); - s7.addBox(0F, 0F, 0F, 6, 6, 1); - s7.setRotationPoint(-3F, 16F, 7F); - s7.setTextureSize(64, 64); - s7.mirror = true; - setRotation(s7, 0F, 0F, 0F); - s8 = new ModelRenderer(this, 0, 31); - s8.addBox(0F, 0F, 0F, 1, 6, 6); - s8.setRotationPoint(-8F, 16F, -2F); - s8.setTextureSize(64, 64); - s8.mirror = true; - setRotation(s8, 0F, 0F, 0F); - s9 = new ModelRenderer(this, 0, 31); - s9.addBox(0F, 0F, 0F, 1, 6, 6); - s9.setRotationPoint(7F, 16F, -2F); - s9.setTextureSize(64, 64); - s9.mirror = true; - setRotation(s9, 0F, 0F, 0F); - s10 = new ModelRenderer(this, 15, 37); - s10.addBox(0F, 0F, 0F, 6, 1, 1); - s10.setRotationPoint(-3F, 20F, -5F); - s10.setTextureSize(64, 64); - s10.mirror = true; - setRotation(s10, 0F, 0F, 0F); - s11 = new ModelRenderer(this, 15, 31); - s11.addBox(0F, 1F, 0F, 1, 1, 1); - s11.setRotationPoint(-4F, 18F, -5F); - s11.setTextureSize(64, 64); - s11.mirror = true; - setRotation(s11, 0F, 0F, 0F); - s12 = new ModelRenderer(this, 15, 31); - s12.addBox(0F, 1F, 0F, 1, 1, 1); - s12.setRotationPoint(3F, 18F, -5F); - s12.setTextureSize(64, 64); - s12.mirror = true; - setRotation(s12, 0F, 0F, 0F); - s13 = new ModelRenderer(this, 15, 40); - s13.addBox(0F, 0F, 0F, 2, 2, 1); - s13.setRotationPoint(-3F, 15F, -4.5F); - s13.setTextureSize(64, 64); - s13.mirror = true; - setRotation(s13, 0F, 0F, 0F); - s14 = new ModelRenderer(this, 15, 40); - s14.addBox(0F, 0F, 0F, 2, 2, 1); - s14.setRotationPoint(1F, 15F, -4.5F); - s14.setTextureSize(64, 64); - s14.mirror = true; - setRotation(s14, 0F, 0F, 0F); - s15 = new ModelRenderer(this, 30, 37); - s15.addBox(0F, 0F, 0F, 1, 1, 1); - s15.setRotationPoint(-2.5F, 15.5F, -4.7F); - s15.setTextureSize(64, 64); - s15.mirror = true; - setRotation(s15, 0F, 0F, 0F); - s16 = new ModelRenderer(this, 30, 37); - s16.addBox(0F, 0F, 0F, 1, 1, 1); - s16.setRotationPoint(1.5F, 15.5F, -4.7F); - s16.setTextureSize(64, 64); - s16.mirror = true; - setRotation(s16, 0F, 0F, 0F); - } - - private void setRotation(ModelRenderer model, float x, float y, float z){ - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - @Override - public void render(float f){ - s1.render(f); - s2.render(f); - s3.render(f); - s4.render(f); - s5.render(f); - s6.render(f); - s7.render(f); - s8.render(f); - s9.render(f); - s10.render(f); - s11.render(f); - s12.render(f); - s13.render(f); - s14.render(f); - s15.render(f); - s16.render(f); - } - - @Override - public String getName(){ - return "modelSmileyCloud"; - } - - @Override - public boolean doesRotate(){ - return true; - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java index 2e970c778..ba58fcf10 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java @@ -191,6 +191,9 @@ public class BookletUtils{ else if(button instanceof TexturedButton){ booklet.drawHoveringText(((TexturedButton)button).textList, mouseX, mouseY); } + else if(button instanceof IndexButton){ + ((IndexButton)button).drawHover(mouseX, mouseY); + } } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index b17442a64..01d82845f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -65,7 +65,7 @@ public class InitBooklet{ //Getting Started chapterIntro = new BookletChapter("intro", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3)); new BookletChapter("bookTutorial", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemBooklet), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook)); - new BookletChapter("crystals", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial(); + new BookletChapter("crystals", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("", TileEntityAtomicReconstructor.ENERGY_USE), new PageTextOnly(2), new PageTextOnly(3), new PagePicture(4, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(5), new PageCrafting(6, BlockCrafting.recipeAtomicReconstructor).setNoText().setPageStacksWildcard(), new PageCrafting(7, MiscCrafting.recipesCrystals).setNoText(), new PageCrafting(8, MiscCrafting.recipesCrystalBlocks).setNoText(), new PageReconstructor(9, LensNoneRecipeHandler.mainPageRecipes).setNoText()).setSpecial().setIncomplete(); new BookletChapter("coalGen", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("", TileEntityCoalGenerator.PRODUCE)); new BookletChapter("craftingIngs", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(7, ItemCrafting.recipeRing).setNoText(), new PageCrafting(8, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(11, ItemCrafting.recipeDough).setNoText(), new PageCrafting(12, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(13, BlockCrafting.recipeIronCase).setNoText()).setImportant(); new BookletChapter("rf", ActuallyAdditionsAPI.entryGettingStarted, new ItemStack(Items.redstone), new PageTextOnly(1)); @@ -75,7 +75,7 @@ public class InitBooklet{ new BookletChapter("miscDecorStuffsAndThings", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockTestifiBucksGreenWall), new PageTextOnly(1), new PageReconstructor(2, LensNoneRecipeHandler.recipeWhiteWall).setNoText(), new PageReconstructor(3, LensNoneRecipeHandler.recipeGreenWall).setNoText()); new BookletChapter("bookStand", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockBookletStand), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeBookStand).setPageStacksWildcard()); new BookletChapter("quartz", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("", OreGen.QUARTZ_MIN).addTextReplacement("", OreGen.QUARTZ_MAX), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText()); - new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial(); + new BookletChapter("cloud", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial().setIncomplete(); new BookletChapter("coalStuff", ActuallyAdditionsAPI.entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText()); ArrayList lampPages = new ArrayList(); lampPages.add(new PageTextOnly(lampPages.size()+1)); @@ -99,7 +99,7 @@ public class InitBooklet{ new BookletChapter("greenhouseGlass", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockGreenhouseGlass), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeGlass)); new BookletChapter("fishingNet", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockFishingNet), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFisher).setNoText()); new BookletChapter("feeder", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockFeeder), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFeeder).setNoText()); - new BookletChapter("compost", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood)); + new BookletChapter("compost", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood)).setIncomplete(); new BookletChapter("crate", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockGiantChest), new PageCrafting(1, BlockCrafting.recipeCrate), new PageCrafting(2, ItemCrafting.recipeCrateKeeper), new PageCrafting(3, ItemCrafting.recipeChestToCrateUpgrade)); new BookletChapter("rangedCollector", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText()); @@ -132,7 +132,7 @@ public class InitBooklet{ } new BookletChapter("aiots", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.emeraldPaxel), aiotPages.toArray(new BookletPage[aiotPages.size()])).setImportant(); - new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3)); + new BookletChapter("jams", ActuallyAdditionsAPI.entryItemsNonRF, new ItemStack(InitItems.itemJams), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemJams, 1, Util.WILDCARD)), new PagePicture(2, "pageJamHouse", 150), new PageTextOnly(3)).setIncomplete(); ArrayList potionRingPages = new ArrayList(); potionRingPages.add(new PageTextOnly(potionRingPages.size()+1)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java index 0767fd902..8107169ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java @@ -12,10 +12,14 @@ package de.ellpeck.actuallyadditions.mod.booklet.button; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; +import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.EnumChatFormatting; public class IndexButton extends GuiButton{ @@ -56,4 +60,10 @@ public class IndexButton extends GuiButton{ this.gui.getFontRenderer().drawString(this.displayString, this.xPosition+textOffsetX, this.yPosition+(this.height-8)/2, 0); } } + + public void drawHover(int mouseX, int mouseY){ + if(this.chap instanceof BookletChapter && ((BookletChapter)this.chap).isIncomplete){ + this.gui.drawHoveringText(this.gui.getFontRenderer().listFormattedStringToWidth(EnumChatFormatting.RED+StringUtil.localize("booklet."+ModUtil.MOD_ID_LOWER+".unavailable"), 250), mouseX, mouseY); + } + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java index 25a989431..62c0e29a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/chapter/BookletChapter.java @@ -27,6 +27,8 @@ public class BookletChapter implements IBookletChapter{ private final String unlocalizedName; public EnumChatFormatting color; + public boolean isIncomplete; + public BookletChapter(String unlocalizedName, IBookletEntry entry, ItemStack displayStack, BookletPage... pages){ this.pages = pages.clone(); @@ -48,6 +50,11 @@ public class BookletChapter implements IBookletChapter{ return this.pages; } + public BookletChapter setIncomplete(){ + this.isIncomplete = true; + return this; + } + @Override public String getUnlocalizedName(){ return this.unlocalizedName; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 7b51a382a..7abe85c17 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -11,15 +11,9 @@ package de.ellpeck.actuallyadditions.mod.proxy; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderLaserRelay; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderReconstructorLens; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderSmileyCloud; -import de.ellpeck.actuallyadditions.mod.blocks.render.RenderTileEntity; -import de.ellpeck.actuallyadditions.mod.blocks.render.model.*; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.event.InitEvents; import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; -import de.ellpeck.actuallyadditions.mod.tile.*; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; @@ -28,7 +22,6 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -75,7 +68,8 @@ public class ClientProxy implements IProxy{ InitEvents.initClient(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost())); + //TODO Fix Tile rendering + /*ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFishingNet.class, new RenderTileEntity(new ModelFishingNet())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFurnaceSolar.class, new RenderTileEntity(new ModelFurnaceSolar())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoffeeMachine.class, new RenderTileEntity(new ModelCoffeeMachine())); @@ -83,7 +77,7 @@ public class ClientProxy implements IProxy{ ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBookletStand.class, new RenderTileEntity(new ModelBookletStand())); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAtomicReconstructor.class, new RenderReconstructorLens());*/ //TODO Fix villager //VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png")); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 77758ceff..afc832ca2 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -534,6 +534,7 @@ booklet.actuallyadditions.indexEntry.itemsRF.name=Items that use RF #Booklet Info booklet.actuallyadditions.recipeDisabled=The crafting recipe for this item is disabled in the Config File! If you're on a server, ask the server author to enable it in the config. If you're on a client, press the 'Open Config'-Button on the top right and enable the recipe! +booklet.actuallyadditions.unavailable=Parts of this feature are currently disabled or incomplete due to the not fully complete 1.8.9 Port. You may experience something that's missing or doesn't fully work. Please use this item with caution! booklet.actuallyadditions.clickToSeeRecipe=Click to see more Information booklet.actuallyadditions.amountOfWords=%s words in total booklet.actuallyadditions.amountOfChars=%s characters in total