Skip to content

Render Clean #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Desoroxxx merged 6 commits into from
Nov 17, 2025
Merged

Render Clean #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d463a2
Cleanup render stuff
strubium Nov 11, 2025
af250b5
Getter and Setter
strubium Nov 11, 2025
750f826
Remove explicit <RenderContext<RenderableState>>
strubium Nov 13, 2025
ee5fac8
More <RenderContext<RenderableState>>, remove duplicated null check
strubium Nov 13, 2025
439343e
More getter, more final
strubium Nov 13, 2025
e2c995a
Remove simple debug
strubium Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions src/main/java/com/paneedah/mwc/items/grenade/FlashGrenadeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
import com.paneedah.mwc.models.FlashGrenade;
import com.paneedah.mwc.proxies.CommonProxy;
import com.paneedah.weaponlib.Part;
import com.paneedah.weaponlib.RenderContext;
import com.paneedah.weaponlib.animation.Transition;
import com.paneedah.weaponlib.crafting.CraftingEntry;
import com.paneedah.weaponlib.crafting.CraftingGroup;
import com.paneedah.weaponlib.grenade.GrenadeRenderer;
import com.paneedah.weaponlib.grenade.ItemGrenade;
import com.paneedah.weaponlib.grenade.ItemGrenade.Type;
import com.paneedah.weaponlib.grenade.RenderableState;
import net.minecraft.init.Items;
import org.lwjgl.opengl.GL11;

Expand Down Expand Up @@ -108,15 +106,15 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
})

.withFirstPersonPositioningSafetyPinOff(
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.33f, 0.33f, 0.33f);
GL11.glRotatef(-10.000000f, 1f, 0f, 0f);
GL11.glRotatef(000000f, 0f, 1f, 0f);
GL11.glRotatef(10.000000f, 0f, 0f, 1f);
GL11.glTranslatef(-1.5f, -2.15f, -2.3f);
}, 200, 50),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.33f, 0.33f, 0.33f);
GL11.glRotatef(-10.000000f, 1f, 0f, 0f);
GL11.glRotatef(000000f, 0f, 1f, 0f);
Expand All @@ -127,15 +125,15 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
)

.withFirstPersonLeftHandPositioningSafetyPinOff(
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-90.000000f, 1f, 0f, 0f);
GL11.glRotatef(-5.000000f, 0f, 1f, 0f);
GL11.glRotatef(105.000000f, 0f, 0f, 1f);
GL11.glTranslatef(-0.200000f, -0.775000f, 0.100000f);

}, 70, 0),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-105.000000f, 1f, 0f, 0f);
GL11.glRotatef(0.000000f, 0f, 1f, 0f);
Expand All @@ -145,14 +143,14 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
)

.withFirstPersonRightHandPositioningSafetyPinOff(
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-90.000000f, 1f, 0f, 0f);
GL11.glRotatef(-10.000000f, 0f, 1f, 0f);
GL11.glRotatef(-15.000000f, 0f, 0f, 1f);
GL11.glTranslatef(0.325000f, -0.375000f, -0.125000f);
}, 70, 0),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-90.000000f, 1f, 0f, 0f);
GL11.glRotatef(-10.000000f, 0f, 1f, 0f);
Expand All @@ -162,14 +160,14 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
)

.withFirstPersonCustomPositioningSafetyPinOff(Grenades.GrenadeSafetyPin.getRenderablePart(),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.200000f, 0.200000f, 0.200000f);
GL11.glRotatef(80.000000f, 1f, 0f, 0f);
GL11.glRotatef(-90.000000f, 0f, 1f, 0f);
GL11.glRotatef(0.000000f, 0f, 0f, 1f);
GL11.glTranslatef(-3.899998f, 1.400002f, -2.400000f);
}, 70, 0, Part.LEFT_HAND),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.200000f, 0.200000f, 0.200000f);
GL11.glRotatef(80.000000f, 1f, 0f, 0f);
GL11.glRotatef(-90.000000f, 0f, 1f, 0f);
Expand All @@ -179,7 +177,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
)

.withFirstPersonPositioningThrowing(
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glScalef(0.100000f, 0.100000f, 0.100000f);
GL11.glRotatef(-40.000000f, 1f, 0f, 0f);
Expand All @@ -188,7 +186,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
GL11.glTranslatef(0f, -6.849998f, -2.400000f);
}, 260, 120),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(85.000000f, 1f, 0f, 0f);
GL11.glRotatef(15.000000f, 0f, 1f, 0f);
Expand All @@ -199,7 +197,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
GL11.glScalef(0.000000f, 0.000000f, 0.000000f);
}, 80, 80),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(155.000000f, 1f, 0f, 0f);
GL11.glRotatef(-45.000000f, 0f, 1f, 0f);
Expand All @@ -208,15 +206,15 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
}, 80, 80))

.withFirstPersonLeftHandPositioningThrowing(
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-105.000000f, 1f, 0f, 0f);
GL11.glRotatef(0.000000f, 0f, 1f, 0f);
GL11.glRotatef(75.000000f, 0f, 0f, 1f);
GL11.glTranslatef(0.175000f, -1.025000f, 0.225000f);
}, 70, 0),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-105.000000f, 1f, 0f, 0f);
GL11.glRotatef(0.000000f, 0f, 1f, 0f);
Expand All @@ -225,7 +223,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {

}, 70, 0),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-100.000000f, 1f, 0f, 0f);
GL11.glRotatef(30.000000f, 0f, 1f, 0f);
Expand All @@ -236,15 +234,15 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
)

.withFirstPersonRightHandPositioningThrowing(
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-150.000000f, 1f, 0f, 0f);
GL11.glRotatef(10.000000f, 0f, 1f, 0f);
GL11.glRotatef(0.000000f, 0f, 0f, 1f);
GL11.glTranslatef(0.5f, -0.200000f, -0.300000f);
}, 70, 0),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
GL11.glRotatef(-80.000000f, 1f, 0f, 0f);
GL11.glRotatef(-5.000000f, 0f, 1f, 0f);
Expand All @@ -253,7 +251,7 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {

}, 70, 0),

new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
// GL11.glScalef(3.000000f, 3.000000f, 3.000000f);
// GL11.glRotatef(-30.000000f, 1f, 0f, 0f);
// GL11.glRotatef(10.000000f, 0f, 1f, 0f);
Expand All @@ -262,21 +260,21 @@ public ItemGrenade createGrenade(CommonProxy commonProxy) {
}, 70, 0))

.withFirstPersonCustomPositioningThrowing(Grenades.GrenadeSafetyPin.getRenderablePart(),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.200000f, 0.200000f, 0.200000f);
GL11.glRotatef(80.000000f, 1f, 0f, 0f);
GL11.glRotatef(-90.000000f, 0f, 1f, 0f);
GL11.glRotatef(0.000000f, 0f, 0f, 1f);
GL11.glTranslatef(-3.899998f, 1.400002f, -2.400000f);
}, 70, 0, Part.LEFT_HAND),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.200000f, 0.200000f, 0.200000f);
GL11.glRotatef(80.000000f, 1f, 0f, 0f);
GL11.glRotatef(-90.000000f, 0f, 1f, 0f);
GL11.glRotatef(0.000000f, 0f, 0f, 1f);
GL11.glTranslatef(-3.899998f, 1.400002f, -2.400000f);
}, 70, 0, Part.LEFT_HAND),
new Transition<RenderContext<RenderableState>>(renderContext -> {
new Transition<>(renderContext -> {
GL11.glScalef(0.200000f, 0.200000f, 0.200000f);
GL11.glRotatef(80.000000f, 1f, 0f, 0f);
GL11.glRotatef(-90.000000f, 0f, 1f, 0f);
Expand Down
Loading
Loading