Skip to content

Commit bd95afc

Browse files
committed
Remove accesswidener for ModelPart
1 parent c5fd482 commit bd95afc

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/main/java/com/simibubi/create/content/trains/schedule/hat/TrainHatArmorLayer.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.simibubi.create.content.trains.schedule.hat;
22

3+
import java.util.ArrayList;
4+
import java.util.List;
5+
36
import com.jozufozu.flywheel.util.transform.TransformStack;
47
import com.mojang.blaze3d.vertex.PoseStack;
58
import com.simibubi.create.AllPartialModels;
@@ -12,7 +15,6 @@
1215
import com.simibubi.create.foundation.utility.Couple;
1316

1417
import io.github.fabricators_of_create.porting_lib.mixin.accessors.client.accessor.ModelPartAccessor;
15-
import io.github.fabricators_of_create.porting_lib.mixin.accessors.common.accessor.LivingEntityAccessor;
1618
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback.RegistrationHelper;
1719
import net.minecraft.client.model.AgeableListModel;
1820
import net.minecraft.client.model.EntityModel;
@@ -36,9 +38,6 @@
3638
import net.minecraft.world.level.block.Blocks;
3739
import net.minecraft.world.level.block.state.BlockState;
3840

39-
import java.util.ArrayList;
40-
import java.util.List;
41-
4241
public class TrainHatArmorLayer<T extends LivingEntity, M extends EntityModel<T>> extends RenderLayer<T, M> {
4342

4443
public TrainHatArmorLayer(RenderLayerParent<T, M> renderer) {
@@ -81,7 +80,7 @@ public void render(PoseStack ms, MultiBufferSource buffer, int light, LivingEnti
8180

8281
ModelPart lastChild = partsToHead.get(partsToHead.size() - 1);
8382
if (!lastChild.isEmpty()) {
84-
Cube cube = ((ModelPartAccessor) lastChild).porting_lib$cubes().get(Mth.clamp(info.cubeIndex(), 0, ((ModelPartAccessor) lastChild).porting_lib$cubes().size() - 1));
83+
Cube cube = ((ModelPartAccessor) (Object) lastChild).porting_lib$cubes().get(Mth.clamp(info.cubeIndex(), 0, ((ModelPartAccessor) lastChild).porting_lib$cubes().size() - 1));
8584
ms.translate(info.offset().x() / 16.0F, (cube.minY - cube.maxY + info.offset().y()) / 16.0F, info.offset().z() / 16.0F);
8685
float max = Math.max(cube.maxX - cube.minX, cube.maxZ - cube.minZ) / 8.0F * info.scale();
8786
ms.scale(max, max, max);

src/main/java/com/simibubi/create/content/trains/schedule/hat/TrainHatInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public static List<ModelPart> getAdjustedPart(TrainHatInfo info, ModelPart root,
4141
}
4242

4343
public static Map<String, ModelPart> getChildren(ModelPart modelPart) {
44-
return ((ModelPartAccessor) modelPart).porting_lib$children();
44+
return ((ModelPartAccessor) (Object) modelPart).porting_lib$children();
4545
}
4646
}

src/main/resources/create.accesswidener

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ accessible field net/minecraft/data/tags/TagsProvider$TagAppender builder Lnet/m
2626
# I (IThundxr) will change these to use accessors upstream eventually
2727
accessible field net/minecraft/client/renderer/LevelRenderer capturedFrustum Lnet/minecraft/client/renderer/culling/Frustum;
2828
accessible field net/minecraft/client/renderer/LevelRenderer cullingFrustum Lnet/minecraft/client/renderer/culling/Frustum;
29-
30-
# Can't cast a final class to a interface (accessor)
31-
extendable class net/minecraft/client/model/geom/ModelPart

0 commit comments

Comments
 (0)