mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-26 03:17:38 +00:00
Code Issues Releases Wiki Activity

remove all filthy access wideners

Browse Source
This commit is contained in:
Devan-Kerman
2020-09-06 20:04:23 -05:00
parent 14df44f09d
commit 1346a26179
35 changed files with 207 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
View File

@@ -6,6 +6,8 @@
package dan200.computercraft.client.render;
import dan200.computercraft.mixin.HeldItemRendererAccess;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.item.HeldItemRenderer;
@@ -66,14 +68,15 @@ public abstract class ItemMapLikeRenderer {
float tZ = -0.4f * MathHelper.sin(swingRt * (float) Math.PI);
transform.translate(0, -tX / 2, tZ);
float pitchAngle = renderer.getMapAngle(pitch);
HeldItemRendererAccess access = (HeldItemRendererAccess) render;
float pitchAngle = access.callGetMapAngle(pitch);
transform.translate(0, 0.04F + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f);
transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(pitchAngle * -85.0f));
if (!minecraft.player.isInvisible()) {
transform.push();
transform.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F));
renderer.renderArm(transform, render, combinedLight, Arm.RIGHT);
renderer.renderArm(transform, render, combinedLight, Arm.LEFT);
access.callRenderArm(transform, render, combinedLight, Arm.RIGHT);
access.callRenderArm(transform, render, combinedLight, Arm.LEFT);
transform.pop();
}
@@ -105,8 +108,8 @@ public abstract class ItemMapLikeRenderer {
if (!minecraft.player.isInvisible()) {
transform.push();
transform.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(offset * 10f));
minecraft.getHeldItemRenderer()
.renderArmHoldingItem(transform, render, combinedLight, equipProgress, swingProgress, side);
((HeldItemRendererAccess)minecraft.getHeldItemRenderer())
.callRenderArmHoldingItem(transform, render, combinedLight, equipProgress, swingProgress, side);
transform.pop();
}

4
src/main/java/dan200/computercraft/client/render/ModelTransformer.java
View File

@@ -8,6 +8,8 @@ package dan200.computercraft.client.render;
import java.util.List;
import dan200.computercraft.mixin.BakedQuadAccess;
import net.minecraft.client.render.VertexFormat;
import net.minecraft.client.render.VertexFormatElement;
import net.minecraft.client.render.VertexFormats;
@@ -51,7 +53,7 @@ public final class ModelTransformer {
int[] vertexData = quad.getVertexData()
.clone();
int offset = 0;
BakedQuad copy = new BakedQuad(vertexData, -1, quad.getFace(), quad.sprite, true);
BakedQuad copy = new BakedQuad(vertexData, -1, quad.getFace(), ((BakedQuadAccess)quad).getSprite(), true);
for (int i = 0; i < format.getElements()
.size(); ++i) // For each vertex element
{

4
src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
View File

@@ -6,6 +6,7 @@
package dan200.computercraft.client.render;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Random;
@@ -64,7 +65,8 @@ public class TurtleSmartItemModel implements BakedModel {
this.familyModel = familyModel;
this.colourModel = colourModel;
this.m_overrides = new ModelOverrideList() {
// this actually works I think, trust me
this.m_overrides = new ModelOverrideList(null, null, null, Collections.emptyList()) {
@Nonnull
@Override
public BakedModel apply(@Nonnull BakedModel originalModel, @Nonnull ItemStack stack, @Nullable ClientWorld world,