From 556e98c0d3ddd72abe51126d8887055a0f72ab83 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 28 Aug 2024 16:34:49 +0200 Subject: [PATCH] i spent all day doing stupid shit --- CONTRIBUTING.md | 4 +-- .../com/hbm/render/tileentity/RenderLPW2.java | 23 ++++++++---------- .../hbm/textures/models/trinkets/frizzle.png | Bin 2655 -> 1707 bytes 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 34e1e5ca9..e6efdf8c8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,11 +30,9 @@ This ties together with the previous point - there's no guarantees that your PR ## I want to help but don't know where to start -If you want to help the project, consider getting involved with the [wiki](ntm.fandom.com) first. Writing an article is the easiest and quickest way of helping, and requires no programming knowledge. If you do know Java and want to help, consider these places first: +If you want to help the project, consider getting involved with the [wiki](https://nucleartech.wiki/) first. Writing an article is the easiest and quickest way of helping, and requires no programming knowledge. If you do know Java and want to help, consider these places first: * Localization, i.e. translations in different language are always accepted. * `IConfigurableMachine`, an interface that allows machines to be added to the `hbmMachines.json` config, is still not used by many machines. * F1 Presentations, also known as "Stare" or "Jar Presentations", is a neat system of creating a short movie explaining functionality. All the relevant code can be found in `com.hbm.wiaj`. -* Some guns still use the old "bow-style" systems and not `ItemGunBase`. -* Many guns don't have any animations whatsoever, just adding a minor recoil would already improve them by a lot. * Adding tooltips to more machines, explaining some of the basics. diff --git a/src/main/java/com/hbm/render/tileentity/RenderLPW2.java b/src/main/java/com/hbm/render/tileentity/RenderLPW2.java index af3383c5e..bb5e674f0 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderLPW2.java +++ b/src/main/java/com/hbm/render/tileentity/RenderLPW2.java @@ -183,15 +183,10 @@ public class RenderLPW2 extends TileEntitySpecialRenderer { GL11.glTranslated(0, 0, piston * 0.375D + 0.375D); ResourceManager.lpw2.renderPart("Piston"); GL11.glPopMatrix(); - //main assembly - //turbine rotors - //pump rotor - //pump piston - //engine bell - //suspension renderBell(h, v); GL11.glPopMatrix(); + renderShroud(h, v); } @@ -204,7 +199,6 @@ public class RenderLPW2 extends TileEntitySpecialRenderer { GL11.glTranslated(0, -3.5, -2.75); ResourceManager.lpw2.renderPart("Engine"); GL11.glPopMatrix(); - //bell with rotations } public static void renderShroud(double h, double v) { @@ -264,16 +258,19 @@ public class RenderLPW2 extends TileEntitySpecialRenderer { GL11.glTranslated(0, -0.875D, 0); ResourceManager.lpw2.renderPart("SuspensionBottom"); GL11.glPopMatrix(); - - //shrouds - //flaps - //suspension } public static void renderFlap(double position, double rotation) { GL11.glPushMatrix(); - GL11.glTranslated(0, 3.5D, 0); GL11.glRotated(position, 0, 0, 1); GL11.glTranslated(0, -3.5D, 0); - GL11.glTranslated(0, 6.96875D, 8.5D); GL11.glRotated(rotation, 1, 0, 0); GL11.glTranslated(0, -6.96875D, -8.5D); + + GL11.glTranslated(0, 3.5D, 0); + GL11.glRotated(position, 0, 0, 1); + GL11.glTranslated(0, -3.5D, 0); + + GL11.glTranslated(0, 6.96875D, 8.5D); + GL11.glRotated(rotation, 1, 0, 0); + GL11.glTranslated(0, -6.96875D, -8.5D); + ResourceManager.lpw2.renderPart("Flap"); GL11.glPopMatrix(); } diff --git a/src/main/resources/assets/hbm/textures/models/trinkets/frizzle.png b/src/main/resources/assets/hbm/textures/models/trinkets/frizzle.png index 9f86fdd638582b8919aa10057272451790ed37e6..0e82cf2852b4f369329065f8ebf55d3cc0042e8a 100644 GIT binary patch delta 1692 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 FV1nB(@FxHO