From 13741930ca5b5df0f13c0a6d7e818b26b903409c Mon Sep 17 00:00:00 2001 From: Boblet Date: Fri, 25 Apr 2025 15:07:49 +0200 Subject: [PATCH] more crap --- changelog | 3 +- .../item/weapon/sedna/ItemRenderMinigun.java | 14 ++- .../java/com/hbm/render/loader/HbmFace.java | 1 + .../com/hbm/render/loader/HbmGroupObject.java | 1 + .../com/hbm/render/loader/HbmModelObject.java | 1 + .../com/hbm/render/loader/HmfController.java | 1 + .../com/hbm/render/loader/HmfModelLoader.java | 1 + .../com/hbm/render/model/ProtoCopter.java | 105 ------------------ .../TileEntityMachineStrandCaster.java | 2 +- 9 files changed, 19 insertions(+), 110 deletions(-) delete mode 100644 src/main/java/com/hbm/render/model/ProtoCopter.java diff --git a/changelog b/changelog index 2986d3d8f..52b2a715c 100644 --- a/changelog +++ b/changelog @@ -34,4 +34,5 @@ * Fixed special creeper types being able to spawn in other dimensions * Fixed modeled armor using weird rotation rules, causing issues with Customizable Player Models * Fixed rotation issues for certain blocks using the new structure system -* Fixed ReaSim water never moving if the reactor is at 20° \ No newline at end of file +* Fixed ReaSim water never moving if the reactor is at 20° +* Fixed strand caster LPS gauge exceeding the limit \ No newline at end of file diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java index d3060f661..cb8c776dd 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMinigun.java @@ -2,6 +2,7 @@ package com.hbm.render.item.weapon.sedna; import org.lwjgl.opengl.GL11; +import com.hbm.items.ModItems; import com.hbm.items.weapon.sedna.ItemGunBaseNT; import com.hbm.main.ResourceManager; import com.hbm.render.anim.HbmAnimations; @@ -78,9 +79,16 @@ public class ItemRenderMinigun extends ItemRenderWeaponBase { GL11.glPushMatrix(); GL11.glTranslated(0, 0, 12); GL11.glRotated(90, 0, 1, 0); - GL11.glRotated(gun.shotRand * 90, 1, 0, 0); - GL11.glScaled(1.5, 1.5, 1.5); - this.renderMuzzleFlash(gun.lastShot[0], 75, 5); + + if(stack.getItem() == ModItems.gun_minigun_lacunae) { + renderLaserFlash(gun.lastShot[0], 50, 1D, 0xff00ff); + GL11.glTranslated(0, 0, -0.25); + renderLaserFlash(gun.lastShot[0], 50, 0.5D, 0xff0080); + } else { + GL11.glRotated(gun.shotRand * 90, 1, 0, 0); + GL11.glScaled(1.5, 1.5, 1.5); + this.renderMuzzleFlash(gun.lastShot[0], 75, 5); + } GL11.glPopMatrix(); } diff --git a/src/main/java/com/hbm/render/loader/HbmFace.java b/src/main/java/com/hbm/render/loader/HbmFace.java index 5290eb29e..3245bee65 100644 --- a/src/main/java/com/hbm/render/loader/HbmFace.java +++ b/src/main/java/com/hbm/render/loader/HbmFace.java @@ -7,6 +7,7 @@ import net.minecraft.util.Vec3; import net.minecraftforge.client.model.obj.TextureCoordinate; import net.minecraftforge.client.model.obj.Vertex; +@Deprecated public class HbmFace { public Vertex[] vertices; public Vertex[] vertexNormals; diff --git a/src/main/java/com/hbm/render/loader/HbmGroupObject.java b/src/main/java/com/hbm/render/loader/HbmGroupObject.java index 77dc6c66c..43c5085d4 100644 --- a/src/main/java/com/hbm/render/loader/HbmGroupObject.java +++ b/src/main/java/com/hbm/render/loader/HbmGroupObject.java @@ -6,6 +6,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.Tessellator; +@Deprecated public class HbmGroupObject { public String name; diff --git a/src/main/java/com/hbm/render/loader/HbmModelObject.java b/src/main/java/com/hbm/render/loader/HbmModelObject.java index 388280212..2ea6e948d 100644 --- a/src/main/java/com/hbm/render/loader/HbmModelObject.java +++ b/src/main/java/com/hbm/render/loader/HbmModelObject.java @@ -23,6 +23,7 @@ import net.minecraftforge.client.model.obj.Vertex; import com.hbm.util.Clock; +@Deprecated public class HbmModelObject implements IModelCustom { private static Pattern vertexPattern = Pattern.compile("(v( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *\\n)|(v( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *$)"); private static Pattern vertexNormalPattern = Pattern.compile("(vn( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *\\n)|(vn( (\\-){0,1}\\d+(\\.\\d+)?){3,4} *$)"); diff --git a/src/main/java/com/hbm/render/loader/HmfController.java b/src/main/java/com/hbm/render/loader/HmfController.java index 9f85d4a98..86aae64e2 100644 --- a/src/main/java/com/hbm/render/loader/HmfController.java +++ b/src/main/java/com/hbm/render/loader/HmfController.java @@ -1,5 +1,6 @@ package com.hbm.render.loader; +@Deprecated public class HmfController { public static double modoloMod = 100000D; diff --git a/src/main/java/com/hbm/render/loader/HmfModelLoader.java b/src/main/java/com/hbm/render/loader/HmfModelLoader.java index 96884f13d..1dde9e2e1 100644 --- a/src/main/java/com/hbm/render/loader/HmfModelLoader.java +++ b/src/main/java/com/hbm/render/loader/HmfModelLoader.java @@ -5,6 +5,7 @@ import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.IModelCustomLoader; import net.minecraftforge.client.model.ModelFormatException; +@Deprecated public class HmfModelLoader implements IModelCustomLoader { @Override diff --git a/src/main/java/com/hbm/render/model/ProtoCopter.java b/src/main/java/com/hbm/render/model/ProtoCopter.java deleted file mode 100644 index 367275a41..000000000 --- a/src/main/java/com/hbm/render/model/ProtoCopter.java +++ /dev/null @@ -1,105 +0,0 @@ -// Date: 23.07.2016 18:06:22 -// Template version 1.1 -// Java generated by Techne -// Keep in mind that you still need to fill in some blanks -// - ZeuX - -package com.hbm.render.model; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -public class ProtoCopter extends ModelBase { - - ModelRenderer Shape1; - ModelRenderer Shape2; - ModelRenderer Shape3; - ModelRenderer Shape4; - ModelRenderer Shape5; - ModelRenderer Shape6; - ModelRenderer Shape7; - ModelRenderer Shape8; - - public ProtoCopter() { - this.textureWidth = 128; - this.textureHeight = 64; - - int x = 0; - int z = -2; - - this.Shape1 = new ModelRenderer(this, 0, 0); - this.Shape1.addBox(0F, 0F, 0F, 16, 4, 4); - this.Shape1.setRotationPoint(-8F + x, 0F, 0F + z); - this.Shape1.setTextureSize(128, 64); - this.Shape1.mirror = true; - setRotation(this.Shape1, 0F, 0F, 0F); - this.Shape2 = new ModelRenderer(this, 0, 0); - this.Shape2.addBox(0F, 0F, 0F, 4, 8, 4); - this.Shape2.setRotationPoint(-12F + x, 0F, 0F + z); - this.Shape2.setTextureSize(128, 64); - this.Shape2.mirror = true; - setRotation(this.Shape2, 0F, 0F, 0F); - this.Shape3 = new ModelRenderer(this, 0, 0); - this.Shape3.addBox(0F, 0F, 0F, 7, 3, 2); - this.Shape3.setRotationPoint(8F + x, 0F, 1F + z); - this.Shape3.setTextureSize(128, 64); - this.Shape3.mirror = true; - setRotation(this.Shape3, 0F, 0F, 0F); - this.Shape4 = new ModelRenderer(this, 0, 0); - this.Shape4.addBox(0F, 0F, 0F, 6, 6, 2); - this.Shape4.setRotationPoint(15F + x, 0F, 1F + z); - this.Shape4.setTextureSize(128, 64); - this.Shape4.mirror = true; - setRotation(this.Shape4, 0F, 0F, 0F); - this.Shape5 = new ModelRenderer(this, 0, 0); - this.Shape5.addBox(0F, 0F, 0F, 5, 5, 2); - this.Shape5.setRotationPoint(-8F + x, 3F, 1F + z); - this.Shape5.setTextureSize(128, 64); - this.Shape5.mirror = true; - setRotation(this.Shape5, 0F, 0F, 0F); - this.Shape6 = new ModelRenderer(this, 0, 0); - this.Shape6.addBox(0F, 0F, 0F, 4, 2, 14); - this.Shape6.setRotationPoint(-3F + x, 4F, -5F + z); - this.Shape6.setTextureSize(128, 64); - this.Shape6.mirror = true; - setRotation(this.Shape6, 0F, 0F, 0F); - this.Shape7 = new ModelRenderer(this, 0, 0); - this.Shape7.addBox(0F, 0F, 0F, 2, 4, 2); - this.Shape7.setRotationPoint(-1F + x, -4F, 1F + z); - this.Shape7.setTextureSize(128, 64); - this.Shape7.mirror = true; - setRotation(this.Shape7, 0F, 0F, 0F); - this.Shape8 = new ModelRenderer(this, 0, 0); - this.Shape8.addBox(-14F, 0F, -14F, 28, 1, 28); - this.Shape8.setRotationPoint(0F + x, -3F, 2F + z); - this.Shape8.setTextureSize(128, 64); - this.Shape8.mirror = true; - setRotation(this.Shape8, 0F, 0F, 0F); - } - - @Override - public void render(Entity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor) { - - this.renderAll(scaleFactor); - } - - public void renderAll(float f5) { - - this.Shape1.render(f5); - this.Shape2.render(f5); - this.Shape3.render(f5); - this.Shape4.render(f5); - this.Shape5.render(f5); - this.Shape6.render(f5); - this.Shape7.render(f5); - this.Shape8.render(f5); - } - - private static 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/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java index ae0493c98..bc7eb46b6 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java @@ -129,7 +129,7 @@ public class TileEntityMachineStrandCaster extends TileEntityFoundryCastingBase if(type != null && mold != null && mold.getOutput(type) != null) { for(int i = 1; i < 7; i++) { if(slots[i] == null || slots[i].isItemEqual(mold.getOutput(type)) && slots[i].stackSize + mold.getOutput(type).stackSize <= mold.getOutput(type).getMaxStackSize()) - return water.getFill() >= getWaterRequired() * itemsCasted && steam.getFill() < steam.getMaxFill(); + return water.getFill() >= getWaterRequired() * itemsCasted && steam.getFill() + getWaterRequired() <= steam.getMaxFill(); } }