From 26f4158c17e339850b7dbb56ac7a36959b4731ba Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 27 Jan 2025 23:21:30 -0500 Subject: [PATCH] Legacy Carpentry Bench Support --- .../legacy/ModelLegacyCarpentryBench.java | 113 ++++++++++++++++++ .../renderer/blocks/BlockBannerRenderer.java | 2 +- .../blocks/BlockCarpentryBenchRenderer.java | 33 +++-- .../{BannerFlag.png => legacy/banner.png} | Bin .../textures/models/legacy/bench.png | Bin 0 -> 1727 bytes 5 files changed, 139 insertions(+), 9 deletions(-) create mode 100644 src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java rename src/main/resources/assets/customnpcs/textures/models/{BannerFlag.png => legacy/banner.png} (100%) create mode 100644 src/main/resources/assets/customnpcs/textures/models/legacy/bench.png diff --git a/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java new file mode 100644 index 000000000..9ccbd93e2 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/blocks/legacy/ModelLegacyCarpentryBench.java @@ -0,0 +1,113 @@ +package noppes.npcs.client.model.blocks.legacy; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelLegacyCarpentryBench extends ModelBase { + // fields + ModelRenderer Leg1; + ModelRenderer Leg2; + ModelRenderer Leg3; + ModelRenderer Leg4; + ModelRenderer Bottom_plate; + ModelRenderer Desktop; + ModelRenderer Backboard; + ModelRenderer Vice_Jaw1; + ModelRenderer Vice_Jaw2; + ModelRenderer Vice_Base1; + ModelRenderer Vice_Base2; + ModelRenderer Vice_Crank; + ModelRenderer Vice_Screw; + ModelRenderer Blueprint; + + public ModelLegacyCarpentryBench() { + this.textureWidth = 128; + this.textureHeight = 64; + + Leg1 = new ModelRenderer(this, 0, 0); + Leg1.addBox(0F, 0F, 0F, 2, 14, 2); + Leg1.setRotationPoint(6F, 10F, 5F); + + Leg2 = new ModelRenderer(this, 0, 0); + Leg2.addBox(0F, 0F, 0F, 2, 14, 2); + Leg2.setRotationPoint(6F, 10F, -5F); + + Leg3 = new ModelRenderer(this, 0, 0); + Leg3.addBox(0F, 0F, 0F, 2, 14, 2); + Leg3.setRotationPoint(-8F, 10F, 5F); + + Leg4 = new ModelRenderer(this, 0, 0); + Leg4.addBox(0F, 0F, 0F, 2, 14, 2); + Leg4.setRotationPoint(-8F, 10F, -5F); + + Bottom_plate = new ModelRenderer(this, 0, 24); + Bottom_plate.addBox(0F, 0F, 0F, 14, 1, 10); + Bottom_plate.setRotationPoint(-7F, 21F, -4F); + Bottom_plate.setTextureSize(130, 64); + + Desktop = new ModelRenderer(this, 0, 3); + Desktop.addBox(0F, 0F, 0F, 18, 2, 13); + Desktop.setRotationPoint(-9F, 9F, -6F); + + Backboard = new ModelRenderer(this, 0, 18); + Backboard.addBox(-1F, 0F, 0F, 18, 5, 1); + Backboard.setRotationPoint(-8F, 7F, 7F); + + Vice_Jaw1 = new ModelRenderer(this, 54, 18); + Vice_Jaw1.addBox(0F, 0F, 0F, 3, 2, 1); + Vice_Jaw1.setRotationPoint(3F, 6F, -8F); + + Vice_Jaw2 = new ModelRenderer(this, 54, 21); + Vice_Jaw2.addBox(0F, 0F, 0F, 3, 2, 1); + Vice_Jaw2.setRotationPoint(3F, 6F, -6F); + + Vice_Base1 = new ModelRenderer(this, 38, 30); + Vice_Base1.addBox(0F, 0F, 0F, 3, 1, 3); + Vice_Base1.setRotationPoint(3F, 8F, -5F); + + Vice_Base2 = new ModelRenderer(this, 38, 25); + Vice_Base2.addBox(0F, 0F, 0F, 1, 2, 2); + Vice_Base2.setRotationPoint(4F, 7F, -5F); + + Vice_Crank = new ModelRenderer(this, 54, 24); + Vice_Crank.addBox(0F, 0F, 0F, 1, 5, 1); + Vice_Crank.setRotationPoint(6F, 6F, -9F); + + Vice_Screw = new ModelRenderer(this, 44, 25); + Vice_Screw.addBox(0F, 0F, 0F, 1, 1, 4); + Vice_Screw.setRotationPoint(4F, 8F, -8F); + + Blueprint = new ModelRenderer(this, 31, 18); + Blueprint.addBox(0F, 0F, 0F, 8, 0, 7); + Blueprint.setRotationPoint(0F, 9F, 1F); + setRotation(Blueprint, 0.3271718F, 0.1487144F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5,entity); + Leg1.render(f5); + Leg2.render(f5); + Leg3.render(f5); + Leg4.render(f5); + Bottom_plate.render(f5); + Desktop.render(f5); + Backboard.render(f5); + Vice_Jaw1.render(f5); + Vice_Jaw2.render(f5); + Vice_Base1.render(f5); + Vice_Base2.render(f5); + Vice_Crank.render(f5); + Vice_Screw.render(f5); + Blueprint.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + +} diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java index 2bfc59e26..d7e19393e 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBannerRenderer.java @@ -32,7 +32,7 @@ public class BlockBannerRenderer extends BlockRendererInterface{ private final ModelBannerFloor banner = new ModelBannerFloor(); private final ModelBannerFloorFlag flag = new ModelBannerFloorFlag(); - public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/BannerFlag.png"); + public static final ResourceLocation legacyFlagResource = new ResourceLocation("customnpcs","textures/models/legacy/banner.png"); public static final ResourceLocation normalFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/normal.png"); public static final ResourceLocation pointyFlag = new ResourceLocation("customnpcs","textures/models/banner/flag/pointy.png"); diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java index 81a8de7d3..70df788b1 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCarpentryBenchRenderer.java @@ -12,15 +12,21 @@ import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCarpentryBench; import noppes.npcs.client.model.blocks.ModelAnvil; import noppes.npcs.client.model.blocks.ModelCarpentryBench; +import noppes.npcs.client.model.blocks.legacy.ModelLegacyCarpentryBench; +import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler{ - private final ModelCarpentryBench model = new ModelCarpentryBench(); - private final ModelAnvil anvil = new ModelAnvil(); - private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png"); - private static final ResourceLocation carpentryBench = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png"); + private final ModelCarpentryBench modelCarpentryBench = new ModelCarpentryBench(); + private static final ResourceLocation carpentryBenchTexture = new ResourceLocation("customnpcs","textures/models/CarpentryBench.png"); + private final ModelAnvil anvil = new ModelAnvil(); + + private static final ResourceLocation anvilTexture = new ResourceLocation("customnpcs","textures/models/Steel.png"); + + private final ModelLegacyCarpentryBench legacyBench = new ModelLegacyCarpentryBench(); + private static final ResourceLocation legacyCarpentryBench = new ResourceLocation("customnpcs","textures/models/legacy/bench.png"); public BlockCarpentryBenchRenderer(){ ((BlockCarpentryBench)CustomItems.carpentyBench).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -41,9 +47,15 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple anvil.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } else { + GL11.glEnable(GL11.GL_ALPHA_TEST); - this.bindTexture(carpentryBench); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyCarpentryBench){ + this.bindTexture(legacyCarpentryBench); + legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } else { + this.bindTexture(carpentryBenchTexture); + modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } GL11.glDisable(GL11.GL_ALPHA_TEST); } GL11.glPopMatrix(); @@ -60,8 +72,13 @@ public class BlockCarpentryBenchRenderer extends TileEntitySpecialRenderer imple GL11.glColor3f(1, 1, 1); if(metadata == 0){ - this.bindTexture(carpentryBench); - model.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + if(ConfigClient.LegacyCarpentryBench){ + this.bindTexture(legacyCarpentryBench); + legacyBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } else { + this.bindTexture(carpentryBenchTexture); + modelCarpentryBench.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); + } } else{ this.bindTexture(anvilTexture); diff --git a/src/main/resources/assets/customnpcs/textures/models/BannerFlag.png b/src/main/resources/assets/customnpcs/textures/models/legacy/banner.png similarity index 100% rename from src/main/resources/assets/customnpcs/textures/models/BannerFlag.png rename to src/main/resources/assets/customnpcs/textures/models/legacy/banner.png diff --git a/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png b/src/main/resources/assets/customnpcs/textures/models/legacy/bench.png new file mode 100644 index 0000000000000000000000000000000000000000..e94ff193695782921584591994ef11166312a4ed GIT binary patch literal 1727 zcmV;w20;0VP)~r?sXV1y3^?lzy zXHqEK!RY7D*%!yU3~kS$Cyo7qIzj(OPlo~O5foevz>J{t1NRsfGXSXbfwO1NT7Q4P z4Gav}$jFGDJ9o~;#>Q-Xd_1+}V)Jkgo;hqWg@X^8rL6MMZRb(J44v(i;HB-T+=~@ZA^I%@di&Y5*LE0cwOA z0Bt1$3=R(3hi`06gaM|erc#S+0CJ4X>OXn%Wa8V09!rGiN{;Cq--k8y{sL8i5znZl z0T`(|A3z3R)I<0+58OX5xYl4ab=W%8le$S1E4hESmy)C0KTTf09x<0=Ia z24FPneBk`~^9v#xqH;rsbC|-H1`=zc^-lpH1ZDjPv+6!Ggg*}h)Ce_zF9~@Dz*B(M zb!HF{CeSjV^H~Cz?!D+)WkBmc86}`bcmpu)S26%H0LAtZ&J2L-d?9YeY-@n&%TE;D;Qs_r zcqRKOm=};4K(F!i*Z6*B8Q)iE_|bX?%+_|@u)?aD()ssRSb5F%c9#s$@N-22Y}~lf zKtz5^ON(vUvL%@S$6a07o7=jCk2+5ZbvH^tGC)c6?=IX*(Oy{jQ;9#=-dAR9;=vdk%c%k8!lHkAFzV7R`ZqJ|g+Ixun z>!}ZhP{EZ*{eBOydGqFE0_*{h8T5OoTVzG0k5)epVKl1I@Am+wKHfiX4bQCgd?xU7 z?|ay6#iPI3;I}vJ>u+w`(G!2nML+fit8Y~_KvPpws{I=_Y)Jb6M1HYYESCfQ9s(6` z^x)(6{LV+puXsW9fp0!FH`deBQ|?n@&NFQfrIz!R>_@w%-K=<^^dzu$=8oudEFPGn z3a$hocFHD!+Cd>9JcLB6LgKBQ3d!rT#HJ~{NqEf9!lZQ7JXtmIq%V zytvE|K7;7|yiJ_mS6&9trwknrR0$PQ4d6v&d7v>!Um7$sU|m0^pHDF2*`mh#bF}CS z11vLCNWdF_^u_@5YP{|Vbj*LYf1R84Hcy`bl!0YHmQcD6(E86kfD+N}vxAlf%>b2N z=c?e!z%oEZq>w(^eeGwT&knvUXwCO!0LT8bbt9;6^HgwUU>TqyQb>SxpY%dznSkb? z0n}LF`t|E`H-gLtXki45tLR~XCBmm)eQd)yT0f^!glEm;+WtDOz1Ve2SzrI2Kp+qZ z1OkCTAP@)y0)apv5C{YUfj}S-2m}IwKp+qZ1OkCTAP@)y0)apv5C{YUfk5D%#lNUI V=$88WJN^Iw002ovPDHLkV1m+*P1*ne literal 0 HcmV?d00001