fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fabric port in progress

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-28 00:45:33 +02:00
parent b79cd732b2
commit 37ce6b262e
102 changed files with 650 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/DelegateBakedModel.java
+17 -17
View File
@@ -24,13 +24,13 @@ import java.util.Random;
import javax.annotation.Nullable;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
public abstract class DelegateBakedModel implements BakedModel {
@@ -47,44 +47,44 @@ public abstract class DelegateBakedModel implements BakedModel {
}
@Override
public boolean func_230044_c_() {
return baseModel.func_230044_c_();
public boolean isSideLit() {
return baseModel.isSideLit();
}
@Override
public ItemOverrideList getOverrides() {
public ModelOverrideList getOverrides() {
return baseModel.getOverrides();
}
@Override
public BakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) {
public BakedModel handlePerspective(ModelTransformation.TransformType cameraTransformType, MatrixStack mat) {
baseModel.handlePerspective(cameraTransformType, mat);
return this;
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.baseModel.getParticleTexture();
public Sprite getSprite() {
return this.baseModel.getSprite();
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return this.baseModel.getItemCameraTransforms();
public ModelTransformation getTransformation() {
return this.baseModel.getTransformation();
}
@Override
public boolean isAmbientOcclusion() {
return this.baseModel.isAmbientOcclusion();
public boolean useAmbientOcclusion() {
return this.baseModel.useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return this.baseModel.isGui3d();
public boolean hasDepth() {
return this.baseModel.hasDepth();
}
@Override
public boolean isBuiltInRenderer() {
return this.baseModel.isBuiltInRenderer();
public boolean isBuiltin() {
return this.baseModel.isBuiltin();
}
public BakedModel getBaseModel() {
src/main/java/appeng/client/render/DummyFluidBakedModel.java
+8 -8
View File
@@ -28,8 +28,8 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
/**
@@ -50,32 +50,32 @@ public class DummyFluidBakedModel implements BakedModel {
}
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
return false;
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture() {
public Sprite getSprite() {
return null;
}
@Override
public ItemOverrideList getOverrides() {
public ModelOverrideList getOverrides() {
return null;
}
}
src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
+12 -12
View File
@@ -29,13 +29,13 @@ import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.renderer.TransformationMatrix;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.entity.LivingEntity;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemStack;
@@ -53,10 +53,10 @@ import appeng.fluids.items.FluidDummyItem;
* Override List is used to accomplish this.
*/
public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
private final Function<Material, TextureAtlasSprite> bakedTextureGetter;
private final Function<Material, Sprite> bakedTextureGetter;
public DummyFluidDispatcherBakedModel(BakedModel baseModel,
Function<Material, TextureAtlasSprite> bakedTextureGetter) {
Function<Material, Sprite> bakedTextureGetter) {
super(baseModel);
this.bakedTextureGetter = bakedTextureGetter;
}
@@ -68,23 +68,23 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
}
@Override
public boolean isGui3d() {
return this.getBaseModel().isGui3d();
public boolean hasDepth() {
return this.getBaseModel().hasDepth();
}
@Override
public boolean func_230044_c_() {
return getBaseModel().func_230044_c_();
public boolean isSideLit() {
return getBaseModel().isSideLit();
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public ItemOverrideList getOverrides() {
return new ItemOverrideList() {
public ModelOverrideList getOverrides() {
return new ModelOverrideList() {
@Override
public BakedModel getModelWithOverrides(BakedModel originalModel, ItemStack stack, World world,
LivingEntity entity) {
@@ -102,7 +102,7 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel {
FluidAttributes attributes = fluidStack.getFluid().getAttributes();
Identifier stillTexture = attributes.getStillTexture(fluidStack);
Material stillMaterial = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, stillTexture);
TextureAtlasSprite sprite = DummyFluidDispatcherBakedModel.this.bakedTextureGetter.apply(stillMaterial);
Sprite sprite = DummyFluidDispatcherBakedModel.this.bakedTextureGetter.apply(stillMaterial);
if (sprite == null) {
return new DummyFluidBakedModel(ImmutableList.of());
}
src/main/java/appeng/client/render/DummyFluidItemModel.java
+4 -4
View File
@@ -28,10 +28,10 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -49,8 +49,8 @@ public class DummyFluidItemModel implements IModelGeometry<DummyFluidItemModel>
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
BakedModel bakedBaseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
return new DummyFluidDispatcherBakedModel(bakedBaseModel, spriteGetter);
src/main/java/appeng/client/render/FacadeBakedItemModel.java
+7 -7
View File
@@ -28,11 +28,11 @@ import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import appeng.client.render.cablebus.FacadeBuilder;
@@ -75,22 +75,22 @@ public class FacadeBakedItemModel extends DelegateBakedModel {
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
}
src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java
+3 -3
View File
@@ -21,7 +21,7 @@ package appeng.client.render;
import java.util.Objects;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -47,8 +47,8 @@ public class FacadeDispatcherBakedModel extends DelegateBakedModel {
}
@Override
public ItemOverrideList getOverrides() {
return new ItemOverrideList() {
public ModelOverrideList getOverrides() {
return new ModelOverrideList() {
@Override
public BakedModel getModelWithOverrides(BakedModel originalModel, ItemStack stack, World world,
LivingEntity entity) {
src/main/java/appeng/client/render/FacadeItemModel.java
+4 -3
View File
@@ -25,7 +25,8 @@ import java.util.function.Function;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -44,8 +45,8 @@ public class FacadeItemModel implements IModelGeometry<FacadeItemModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
BakedModel bakedBaseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
FacadeBuilder facadeBuilder = new FacadeBuilder();
src/main/java/appeng/client/render/TesrRenderHelper.java
+2 -2
View File
@@ -24,7 +24,7 @@ import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Direction;
@@ -92,7 +92,7 @@ public class TesrRenderHelper {
// effect at least from head-on
matrixStack.scale(scale, scale, 0.0002f);
MinecraftClient.getInstance().getItemRenderer().renderItem(itemStack, ItemCameraTransforms.TransformType.GUI,
MinecraftClient.getInstance().getItemRenderer().renderItem(itemStack, ModelTransformation.TransformType.GUI,
combinedLightIn, OverlayTexture.NO_OVERLAY, matrixStack, buffers);
matrixStack.pop();
src/main/java/appeng/client/render/cablebus/CableBuilder.java
+32 -32
View File
@@ -28,7 +28,7 @@ import java.util.function.Function;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraft.util.Identifier;
@@ -42,18 +42,18 @@ import appeng.core.AppEng;
class CableBuilder {
// Textures for the cable core types, one per type/color pair
private final EnumMap<CableCoreType, EnumMap<AEColor, TextureAtlasSprite>> coreTextures;
private final EnumMap<CableCoreType, EnumMap<AEColor, Sprite>> coreTextures;
// Textures for rendering the actual connection cubes, one per type/color pair
private final EnumMap<AECableType, EnumMap<AEColor, TextureAtlasSprite>> connectionTextures;
private final EnumMap<AECableType, EnumMap<AEColor, Sprite>> connectionTextures;
private final SmartCableTextures smartCableTextures;
CableBuilder(Function<Material, TextureAtlasSprite> bakedTextureGetter) {
CableBuilder(Function<Material, Sprite> bakedTextureGetter) {
this.coreTextures = new EnumMap<>(CableCoreType.class);
for (CableCoreType type : CableCoreType.values()) {
EnumMap<AEColor, TextureAtlasSprite> colorTextures = new EnumMap<>(AEColor.class);
EnumMap<AEColor, Sprite> colorTextures = new EnumMap<>(AEColor.class);
for (AEColor color : AEColor.values()) {
colorTextures.put(color, bakedTextureGetter.apply(type.getTexture(color)));
@@ -65,7 +65,7 @@ class CableBuilder {
this.connectionTextures = new EnumMap<>(AECableType.class);
for (AECableType type : AECableType.VALIDCABLES) {
EnumMap<AEColor, TextureAtlasSprite> colorTextures = new EnumMap<>(AEColor.class);
EnumMap<AEColor, Sprite> colorTextures = new EnumMap<>(AEColor.class);
for (AEColor color : AEColor.values()) {
colorTextures.put(color, bakedTextureGetter.apply(getConnectionTexture(type, color)));
@@ -128,7 +128,7 @@ class CableBuilder {
public void addCableCore(CableCoreType coreType, AEColor color, List<BakedQuad> quadsOut) {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.coreTextures.get(coreType).get(color);
Sprite texture = this.coreTextures.get(coreType).get(color);
cubeBuilder.setTexture(texture);
switch (coreType) {
@@ -153,13 +153,13 @@ class CableBuilder {
// For to-machine connections, use a thicker end-cap for the connection
if (connectionType != AECableType.GLASS && !cableBusAdjacent) {
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
cubeBuilder.setTexture(texture);
this.addBigCoveredCableSizedCube(facing, cubeBuilder);
}
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.GLASS).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.GLASS).get(cableColor);
cubeBuilder.setTexture(texture);
switch (facing) {
@@ -192,7 +192,7 @@ class CableBuilder {
// and its ends will always be covered by something
cubeBuilder.setDrawFaces(EnumSet.complementOf(EnumSet.of(facing, facing.getOpposite())));
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.GLASS).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.GLASS).get(cableColor);
cubeBuilder.setTexture(texture);
switch (facing) {
@@ -221,7 +221,7 @@ class CableBuilder {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.GLASS).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.GLASS).get(cableColor);
cubeBuilder.setTexture(texture);
switch (facing) {
@@ -254,7 +254,7 @@ class CableBuilder {
// We render all faces except the one on the connection side
cubeBuilder.setDrawFaces(EnumSet.complementOf(EnumSet.of(facing)));
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
cubeBuilder.setTexture(texture);
// Draw a covered connection, if anything but glass is requested
@@ -268,7 +268,7 @@ class CableBuilder {
public void addStraightCoveredConnection(Direction facing, AEColor cableColor, List<BakedQuad> quadsOut) {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
cubeBuilder.setTexture(texture);
setStraightCableUVs(cubeBuilder, facing, 5, 11);
@@ -312,7 +312,7 @@ class CableBuilder {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.COVERED).get(cableColor);
cubeBuilder.setTexture(texture);
addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder);
@@ -330,11 +330,11 @@ class CableBuilder {
// We render all faces except the one on the connection side
cubeBuilder.setDrawFaces(EnumSet.complementOf(EnumSet.of(facing)));
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor);
cubeBuilder.setTexture(texture);
TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
Sprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
// For to-machine connections, use a thicker end-cap for the connection
if (connectionType != AECableType.GLASS && !cableBusAdjacent) {
@@ -374,15 +374,15 @@ class CableBuilder {
List<BakedQuad> quadsOut) {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor);
cubeBuilder.setTexture(texture);
setStraightCableUVs(cubeBuilder, facing, 5, 11);
addStraightCoveredCableSizedCube(facing, cubeBuilder);
TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
Sprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
// Render the channel indicators brightly lit at night
cubeBuilder.setRenderFullBright(true);
@@ -407,13 +407,13 @@ class CableBuilder {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.SMART).get(cableColor);
cubeBuilder.setTexture(texture);
addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder);
TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
Sprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
// Render the channel indicators brightly lit at night
cubeBuilder.setRenderFullBright(true);
@@ -442,7 +442,7 @@ class CableBuilder {
// We render all faces except the one on the connection side
cubeBuilder.setDrawFaces(EnumSet.complementOf(EnumSet.of(facing)));
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.DENSE_COVERED).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.DENSE_COVERED).get(cableColor);
cubeBuilder.setTexture(texture);
addDenseCableSizedCube(facing, cubeBuilder);
@@ -472,7 +472,7 @@ class CableBuilder {
// We render all faces except the one on the connection side
cubeBuilder.setDrawFaces(EnumSet.complementOf(EnumSet.of(facing)));
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.DENSE_SMART).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.DENSE_SMART).get(cableColor);
cubeBuilder.setTexture(texture);
addDenseCableSizedCube(facing, cubeBuilder);
@@ -480,8 +480,8 @@ class CableBuilder {
// Dense cables show used channels in groups of 4, rounded up
channels = (channels + 3) / 4;
TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
Sprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
// Render the channel indicators brightly lit at night
cubeBuilder.setRenderFullBright(true);
@@ -502,7 +502,7 @@ class CableBuilder {
public void addStraightDenseCoveredConnection(Direction facing, AEColor cableColor, List<BakedQuad> quadsOut) {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.DENSE_COVERED).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.DENSE_COVERED).get(cableColor);
cubeBuilder.setTexture(texture);
setStraightCableUVs(cubeBuilder, facing, 5, 11);
@@ -514,7 +514,7 @@ class CableBuilder {
List<BakedQuad> quadsOut) {
CubeBuilder cubeBuilder = new CubeBuilder(quadsOut);
TextureAtlasSprite texture = this.connectionTextures.get(AECableType.DENSE_SMART).get(cableColor);
Sprite texture = this.connectionTextures.get(AECableType.DENSE_SMART).get(cableColor);
cubeBuilder.setTexture(texture);
setStraightCableUVs(cubeBuilder, facing, 5, 11);
@@ -524,8 +524,8 @@ class CableBuilder {
// Dense cables show used channels in groups of 4, rounded up
channels = (channels + 3) / 4;
TextureAtlasSprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
Sprite oddChannel = this.smartCableTextures.getOddTextureForChannels(channels);
Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);
// Render the channel indicators brightly lit at night
cubeBuilder.setRenderFullBright(true);
@@ -721,7 +721,7 @@ class CableBuilder {
return locations;
}
public TextureAtlasSprite getCoreTexture(CableCoreType coreType, AEColor color) {
public Sprite getCoreTexture(CableCoreType coreType, AEColor color) {
return this.coreTextures.get(coreType).get(color);
}
}
src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
+19 -19
View File
@@ -34,15 +34,15 @@ import net.minecraft.block.BlockState;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.renderer.texture.MissingTextureSprite;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import appeng.api.parts.IPartModel;
import appeng.api.util.AECableType;
@@ -58,10 +58,10 @@ public class CableBusBakedModel implements BakedModel {
private final Map<Identifier, BakedModel> partModels;
private final TextureAtlasSprite particleTexture;
private final Sprite particleTexture;
CableBusBakedModel(CableBuilder cableBuilder, FacadeBuilder facadeBuilder,
Map<Identifier, BakedModel> partModels, TextureAtlasSprite particleTexture) {
Map<Identifier, BakedModel> partModels, Sprite particleTexture) {
this.cableBuilder = cableBuilder;
this.facadeBuilder = facadeBuilder;
this.partModels = partModels;
@@ -267,11 +267,11 @@ public class CableBusBakedModel implements BakedModel {
* Gets a list of texture sprites appropriate for particles (digging, etc.)
* given the render state for a cable bus.
*/
public List<TextureAtlasSprite> getParticleTextures(CableBusRenderState renderState) {
public List<Sprite> getParticleTextures(CableBusRenderState renderState) {
CableCoreType coreType = CableCoreType.fromCableType(renderState.getCableType());
AEColor cableColor = renderState.getCableColor();
List<TextureAtlasSprite> result = new ArrayList<>();
List<Sprite> result = new ArrayList<>();
if (coreType != null) {
result.add(this.cableBuilder.getCoreTexture(coreType, cableColor));
@@ -288,7 +288,7 @@ public class CableBusBakedModel implements BakedModel {
throw new IllegalStateException("Trying to use an unregistered part model: " + model);
}
TextureAtlasSprite particleTexture = bakedModel.getParticleTexture();
Sprite particleTexture = bakedModel.getSprite();
// If a part sub-model has no particle texture (indicated by it being the
// missing texture),
@@ -302,43 +302,43 @@ public class CableBusBakedModel implements BakedModel {
return result;
}
private boolean isMissingTexture(TextureAtlasSprite particleTexture) {
private boolean isMissingTexture(Sprite particleTexture) {
return particleTexture instanceof MissingTextureSprite;
}
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
return true;
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;// TODO
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture() {
public Sprite getSprite() {
return this.particleTexture;
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return ItemCameraTransforms.DEFAULT;
public ModelTransformation getTransformation() {
return ModelTransformation.DEFAULT;
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
public static void clearCache() {
src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java
+3 -3
View File
@@ -2,7 +2,7 @@ package appeng.client.render.cablebus;
import net.minecraft.client.particle.IParticleRenderType;
import net.minecraft.client.particle.SpriteTexturedParticle;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.world.World;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@@ -16,7 +16,7 @@ public class CableBusBreakingParticle extends SpriteTexturedParticle {
private final float field_217572_F;
public CableBusBreakingParticle(World world, double x, double y, double z, double speedX, double speedY,
double speedZ, TextureAtlasSprite sprite) {
double speedZ, Sprite sprite) {
super(world, x, y, z, speedX, speedY, speedZ);
this.setSprite(sprite);
this.particleGravity = 1.0F;
@@ -25,7 +25,7 @@ public class CableBusBreakingParticle extends SpriteTexturedParticle {
this.field_217572_F = this.rand.nextFloat() * 3.0F;
}
public CableBusBreakingParticle(World world, double x, double y, double z, TextureAtlasSprite sprite) {
public CableBusBreakingParticle(World world, double x, double y, double z, Sprite sprite) {
this(world, x, y, z, 0, 0, 0, sprite);
}
src/main/java/appeng/client/render/cablebus/CableBusModel.java
+6 -6
View File
@@ -30,10 +30,10 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -55,8 +55,8 @@ public class CableBusModel implements IModelGeometry<CableBusModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
Map<Identifier, BakedModel> partModels = this.loadPartModels(bakery, spriteGetter, modelTransform);
CableBuilder cableBuilder = new CableBuilder(spriteGetter);
@@ -65,7 +65,7 @@ public class CableBusModel implements IModelGeometry<CableBusModel> {
// This should normally not be used, but we *have* to provide a particle texture
// or otherwise damage models will
// crash
TextureAtlasSprite particleTexture = cableBuilder.getCoreTexture(CableCoreType.GLASS, AEColor.TRANSPARENT);
Sprite particleTexture = cableBuilder.getCoreTexture(CableCoreType.GLASS, AEColor.TRANSPARENT);
return new CableBusBakedModel(cableBuilder, facadeBuilder, partModels, particleTexture);
}
@@ -77,7 +77,7 @@ public class CableBusModel implements IModelGeometry<CableBusModel> {
}
private Map<Identifier, BakedModel> loadPartModels(ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn) {
Function<Material, Sprite> spriteGetterIn, IModelTransform transformIn) {
ImmutableMap.Builder<Identifier, BakedModel> result = ImmutableMap.builder();
for (Identifier location : this.partModels.getModels()) {
src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
+1 -1
View File
@@ -29,7 +29,7 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ILightReader;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import appeng.api.parts.IPartModel;
src/main/java/appeng/client/render/cablebus/CubeBuilder.java
+11 -11
View File
@@ -27,7 +27,7 @@ import com.google.common.base.Preconditions;
import net.minecraft.client.renderer.Vector4f;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.math.Direction;
@@ -40,7 +40,7 @@ public class CubeBuilder {
private final List<BakedQuad> output;
private final EnumMap<Direction, TextureAtlasSprite> textures = new EnumMap<>(Direction.class);
private final EnumMap<Direction, Sprite> textures = new EnumMap<>(Direction.class);
private EnumSet<Direction> drawFaces = EnumSet.allOf(Direction.class);
@@ -88,7 +88,7 @@ public class CubeBuilder {
private void putFace(Direction face, float x1, float y1, float z1, float x2, float y2, float z2) {
TextureAtlasSprite texture = this.textures.get(face);
Sprite texture = this.textures.get(face);
BakedQuadBuilder builder = new BakedQuadBuilder(texture);
builder.setQuadOrientation(face);
@@ -152,8 +152,8 @@ public class CubeBuilder {
this.output.add(builder.build());
}
private UvVector getDefaultUv(Direction face, TextureAtlasSprite texture, float x1, float y1, float z1, float x2,
float y2, float z2) {
private UvVector getDefaultUv(Direction face, Sprite texture, float x1, float y1, float z1, float x2,
float y2, float z2) {
UvVector uv = new UvVector();
@@ -199,8 +199,8 @@ public class CubeBuilder {
return uv;
}
private UvVector getStandardUv(Direction face, TextureAtlasSprite texture, float x1, float y1, float z1, float x2,
float y2, float z2) {
private UvVector getStandardUv(Direction face, Sprite texture, float x1, float y1, float z1, float x2,
float y2, float z2) {
UvVector uv = new UvVector();
switch (face) {
case DOWN:
@@ -394,14 +394,14 @@ public class CubeBuilder {
}
}
public void setTexture(TextureAtlasSprite texture) {
public void setTexture(Sprite texture) {
for (Direction face : Direction.values()) {
this.textures.put(face, texture);
}
}
public void setTextures(TextureAtlasSprite up, TextureAtlasSprite down, TextureAtlasSprite north,
TextureAtlasSprite south, TextureAtlasSprite east, TextureAtlasSprite west) {
public void setTextures(Sprite up, Sprite down, Sprite north,
Sprite south, Sprite east, Sprite west) {
this.textures.put(Direction.UP, up);
this.textures.put(Direction.DOWN, down);
this.textures.put(Direction.NORTH, north);
@@ -410,7 +410,7 @@ public class CubeBuilder {
this.textures.put(Direction.WEST, west);
}
public void setTexture(Direction facing, TextureAtlasSprite sprite) {
public void setTexture(Direction facing, Sprite sprite) {
this.textures.put(facing, sprite);
}
src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
+1 -1
View File
@@ -47,7 +47,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ILightReader;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import appeng.api.AEApi;
import appeng.api.util.AEAxisAlignedBB;
src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
+12 -12
View File
@@ -11,24 +11,24 @@ import com.google.common.cache.CacheBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import appeng.api.util.AEColor;
import appeng.util.Platform;
public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
private final TextureAtlasSprite texture;
private final Sprite texture;
private final static Cache<Long, List<BakedQuad>> modelCache = CacheBuilder.newBuilder().maximumSize(100).build();
private static final int[][] QUAD_OFFSETS = new int[][] { { 4, 10, 2 }, { 10, 10, 2 }, { 4, 4, 2 }, { 10, 4, 2 } };
public P2PTunnelFrequencyBakedModel(final TextureAtlasSprite texture) {
public P2PTunnelFrequencyBakedModel(final Sprite texture) {
this.texture = texture;
}
@@ -86,32 +86,32 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
}
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
return false;
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;// TODO
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return true;
}
@Override
public TextureAtlasSprite getParticleTexture() {
public Sprite getSprite() {
return this.texture;
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
}
src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
+5 -5
View File
@@ -10,11 +10,11 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -27,10 +27,10 @@ public class P2PTunnelFrequencyModel implements IModelGeometry<P2PTunnelFrequenc
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
try {
final TextureAtlasSprite texture = spriteGetter.apply(TEXTURE);
final Sprite texture = spriteGetter.apply(TEXTURE);
return new P2PTunnelFrequencyBakedModel(texture);
} catch (Exception e) {
throw new RuntimeException(e);
src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
+6 -6
View File
@@ -23,7 +23,7 @@ import java.util.function.Function;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import appeng.core.AppEng;
@@ -49,18 +49,18 @@ public class SmartCableTextures {
// Textures used to display channels on smart cables. There's two sets of 5
// textures each, and
// one of each set are composed together to get even/odd colored channels
private final TextureAtlasSprite[] textures;
private final Sprite[] textures;
public SmartCableTextures(Function<Material, TextureAtlasSprite> bakedTextureGetter) {
public SmartCableTextures(Function<Material, Sprite> bakedTextureGetter) {
this.textures = Arrays.stream(SMART_CHANNELS_TEXTURES)//
.map(bakedTextureGetter)//
.toArray(TextureAtlasSprite[]::new);
.toArray(Sprite[]::new);
}
/**
* The odd variant is used for displaying channels 1-4 as in use.
*/
public TextureAtlasSprite getOddTextureForChannels(int channels) {
public Sprite getOddTextureForChannels(int channels) {
if (channels < 0) {
return this.textures[0];
} else if (channels <= 4) {
@@ -73,7 +73,7 @@ public class SmartCableTextures {
/**
* The odd variant is used for displaying channels 5-8 as in use.
*/
public TextureAtlasSprite getEvenTextureForChannels(int channels) {
public Sprite getEvenTextureForChannels(int channels) {
if (channels < 5) {
return this.textures[5];
} else if (channels <= 8) {
src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java
+14 -14
View File
@@ -29,11 +29,11 @@ import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.tile.crafting.CraftingCubeModelData;
@@ -47,13 +47,13 @@ import appeng.util.Platform;
*/
abstract class CraftingCubeBakedModel implements IDynamicBakedModel {
private final TextureAtlasSprite ringCorner;
private final Sprite ringCorner;
private final TextureAtlasSprite ringHor;
private final Sprite ringHor;
private final TextureAtlasSprite ringVer;
private final Sprite ringVer;
CraftingCubeBakedModel(TextureAtlasSprite ringCorner, TextureAtlasSprite ringHor, TextureAtlasSprite ringVer) {
CraftingCubeBakedModel(Sprite ringCorner, Sprite ringHor, Sprite ringVer) {
this.ringCorner = ringCorner;
this.ringHor = ringHor;
this.ringVer = ringVer;
@@ -256,33 +256,33 @@ abstract class CraftingCubeBakedModel implements IDynamicBakedModel {
float x1, float y1, float z1, float x2, float y2, float z2);
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
return false;
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture() {
public Sprite getSprite() {
return this.ringCorner;
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
}
src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
+9 -9
View File
@@ -28,11 +28,11 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -76,12 +76,12 @@ class CraftingCubeModel implements IModelGeometry<CraftingCubeModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
// Retrieve our textures and pass them on to the baked model
TextureAtlasSprite ringCorner = spriteGetter.apply(RING_CORNER);
TextureAtlasSprite ringSideHor = spriteGetter.apply(RING_SIDE_HOR);
TextureAtlasSprite ringSideVer = spriteGetter.apply(RING_SIDE_VER);
Sprite ringCorner = spriteGetter.apply(RING_CORNER);
Sprite ringSideHor = spriteGetter.apply(RING_SIDE_HOR);
Sprite ringSideVer = spriteGetter.apply(RING_SIDE_VER);
switch (this.type) {
case UNIT:
@@ -102,8 +102,8 @@ class CraftingCubeModel implements IModelGeometry<CraftingCubeModel> {
}
}
private static TextureAtlasSprite getLightTexture(Function<Material, TextureAtlasSprite> textureGetter,
AbstractCraftingUnitBlock.CraftingUnitType type) {
private static Sprite getLightTexture(Function<Material, Sprite> textureGetter,
AbstractCraftingUnitBlock.CraftingUnitType type) {
switch (type) {
case ACCELERATOR:
return textureGetter.apply(ACCELERATOR_LIGHT);
src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java
+13 -13
View File
@@ -4,13 +4,13 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.renderer.TransformationMatrix;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -25,12 +25,12 @@ import appeng.items.misc.EncodedPatternItem;
* holding shift - The itemstack is being rendered in the UI (not on the ground,
* etc.)
*
* We do this by abusing a custom {@link ItemOverrideList} since it will be
* We do this by abusing a custom {@link ModelOverrideList} since it will be
* called each frame with the itemstack that is about to be rendered. We return
* a custom IBakedModel ({@link ShiftHoldingModelWrapper} if the player is
* holding down shift from the override list. This custom baked model implements
* {@link #doesHandlePerspectives()} and returns the crafting result model if
* the model for {@link ItemCameraTransforms.TransformType#GUI} is requested.
* the model for {@link ModelTransformation.TransformType#GUI} is requested.
*/
public class EncodedPatternBakedModel extends DelegateBakedModel {
@@ -42,7 +42,7 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
}
@Override
public ItemOverrideList getOverrides() {
public ModelOverrideList getOverrides() {
return this.overrides;
}
@@ -71,12 +71,12 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
}
@Override
public BakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) {
public BakedModel handlePerspective(ModelTransformation.TransformType cameraTransformType, MatrixStack mat) {
// No need to re-check for shift being held since this model is only handed out
// in that case
if (cameraTransformType == ItemCameraTransforms.TransformType.GUI) {
ImmutableMap<ItemCameraTransforms.TransformType, TransformationMatrix> transforms = PerspectiveMapWrapper
.getTransforms(outputModel.getItemCameraTransforms());
if (cameraTransformType == ModelTransformation.TransformType.GUI) {
ImmutableMap<ModelTransformation.TransformType, TransformationMatrix> transforms = PerspectiveMapWrapper
.getTransforms(outputModel.getTransformation());
return PerspectiveMapWrapper.handlePerspective(this.outputModel, transforms, cameraTransformType, mat);
} else {
return getBaseModel().handlePerspective(cameraTransformType, mat);
@@ -86,8 +86,8 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
// This determines diffuse lighting in the UI, and since we want to render
// the outputModel in the UI, we need to use it's setting here
@Override
public boolean func_230044_c_() {
return outputModel.func_230044_c_();
public boolean isSideLit() {
return outputModel.isSideLit();
}
}
@@ -98,7 +98,7 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
}
@Override
public BakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) {
public BakedModel handlePerspective(ModelTransformation.TransformType cameraTransformType, MatrixStack mat) {
return getBaseModel().handlePerspective(cameraTransformType, mat);
}
@@ -108,7 +108,7 @@ public class EncodedPatternBakedModel extends DelegateBakedModel {
* actually check if shift is being held, and if so, determine the crafting
* output model.
*/
private class CustomOverrideList extends ItemOverrideList {
private class CustomOverrideList extends ModelOverrideList {
@Nullable
@Override
src/main/java/appeng/client/render/crafting/EncodedPatternModel.java
+4 -4
View File
@@ -9,10 +9,10 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -36,8 +36,8 @@ public class EncodedPatternModel implements IModelGeometry<EncodedPatternModel>
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
BakedModel baseModel = bakery.getBakedModel(this.baseModel, modelTransform, spriteGetter);
return new EncodedPatternBakedModel(baseModel);
}
src/main/java/appeng/client/render/crafting/LightBakedModel.java
+6 -6
View File
@@ -19,9 +19,9 @@
package appeng.client.render.crafting;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IModelData;
import appeng.block.crafting.AbstractCraftingUnitBlock;
import appeng.client.render.cablebus.CubeBuilder;
@@ -33,12 +33,12 @@ import appeng.client.render.cablebus.CubeBuilder;
*/
class LightBakedModel extends CraftingCubeBakedModel {
private final TextureAtlasSprite baseTexture;
private final Sprite baseTexture;
private final TextureAtlasSprite lightTexture;
private final Sprite lightTexture;
LightBakedModel(TextureAtlasSprite ringCorner, TextureAtlasSprite ringHor, TextureAtlasSprite ringVer,
TextureAtlasSprite baseTexture, TextureAtlasSprite lightTexture) {
LightBakedModel(Sprite ringCorner, Sprite ringHor, Sprite ringVer,
Sprite baseTexture, Sprite lightTexture) {
super(ringCorner, ringHor, ringVer);
this.baseTexture = baseTexture;
this.lightTexture = lightTexture;
src/main/java/appeng/client/render/crafting/MonitorBakedModel.java
+10 -10
View File
@@ -19,9 +19,9 @@
package appeng.client.render.crafting;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IModelData;
import appeng.api.util.AEColor;
import appeng.block.crafting.CraftingMonitorBlock;
@@ -38,19 +38,19 @@ import appeng.tile.crafting.CraftingMonitorModelData;
*/
public class MonitorBakedModel extends CraftingCubeBakedModel {
private final TextureAtlasSprite chassisTexture;
private final Sprite chassisTexture;
private final TextureAtlasSprite baseTexture;
private final Sprite baseTexture;
private final TextureAtlasSprite lightDarkTexture;
private final Sprite lightDarkTexture;
private final TextureAtlasSprite lightMediumTexture;
private final Sprite lightMediumTexture;
private final TextureAtlasSprite lightBrightTexture;
private final Sprite lightBrightTexture;
MonitorBakedModel(TextureAtlasSprite ringCorner, TextureAtlasSprite ringHor, TextureAtlasSprite ringVer,
TextureAtlasSprite chassisTexture, TextureAtlasSprite baseTexture, TextureAtlasSprite lightDarkTexture,
TextureAtlasSprite lightMediumTexture, TextureAtlasSprite lightBrightTexture) {
MonitorBakedModel(Sprite ringCorner, Sprite ringHor, Sprite ringVer,
Sprite chassisTexture, Sprite baseTexture, Sprite lightDarkTexture,
Sprite lightMediumTexture, Sprite lightBrightTexture) {
super(ringCorner, ringHor, ringVer);
this.chassisTexture = chassisTexture;
this.baseTexture = baseTexture;
src/main/java/appeng/client/render/crafting/UnitBakedModel.java
+5 -5
View File
@@ -19,9 +19,9 @@
package appeng.client.render.crafting;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IModelData;
import appeng.client.render.cablebus.CubeBuilder;
@@ -30,10 +30,10 @@ import appeng.client.render.cablebus.CubeBuilder;
*/
class UnitBakedModel extends CraftingCubeBakedModel {
private final TextureAtlasSprite unitTexture;
private final Sprite unitTexture;
UnitBakedModel(TextureAtlasSprite ringCorner, TextureAtlasSprite ringHor, TextureAtlasSprite ringVer,
TextureAtlasSprite unitTexture) {
UnitBakedModel(Sprite ringCorner, Sprite ringHor, Sprite ringVer,
Sprite unitTexture) {
super(ringCorner, ringHor, ringVer);
this.unitTexture = unitTexture;
}
src/main/java/appeng/client/render/model/AEInternalModelData.java
+1 -1
View File
@@ -2,7 +2,7 @@ package appeng.client.render.model;
import javax.annotation.Nullable;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
public abstract class AEInternalModelData implements IModelData {
src/main/java/appeng/client/render/model/AEModelData.java
+1 -1
View File
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
/**
src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java
+18 -18
View File
@@ -33,11 +33,11 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.renderer.Vector4f;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.math.Direction;
@@ -45,7 +45,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3i;
import net.minecraft.world.ILightReader;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
import net.minecraftforge.client.model.pipeline.IVertexConsumer;
import net.minecraftforge.client.model.pipeline.QuadGatheringTransformer;
@@ -114,38 +114,38 @@ public class AutoRotatingBakedModel implements BakedModel {
}
@Override
public boolean isAmbientOcclusion() {
return this.parent.isAmbientOcclusion();
public boolean useAmbientOcclusion() {
return this.parent.useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return this.parent.isGui3d();
public boolean hasDepth() {
return this.parent.hasDepth();
}
@Override
public boolean func_230044_c_() {
return parent.func_230044_c_();
public boolean isSideLit() {
return parent.isSideLit();
}
@Override
public boolean isBuiltInRenderer() {
return this.parent.isBuiltInRenderer();
public boolean isBuiltin() {
return this.parent.isBuiltin();
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.parent.getParticleTexture();
public Sprite getSprite() {
return this.parent.getSprite();
}
@Override
@Deprecated
public ItemCameraTransforms getItemCameraTransforms() {
return parent.getItemCameraTransforms();
public ModelTransformation getTransformation() {
return parent.getTransformation();
}
@Override
public ItemOverrideList getOverrides() {
public ModelOverrideList getOverrides() {
return parent.getOverrides();
}
@@ -291,7 +291,7 @@ public class AutoRotatingBakedModel implements BakedModel {
}
@Override
public void setTexture(TextureAtlasSprite texture) {
public void setTexture(Sprite texture) {
this.parent.setTexture(texture);
}
}
src/main/java/appeng/client/render/model/BiometricCardBakedModel.java
+20 -20
View File
@@ -12,13 +12,13 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableList;
import com.mojang.authlib.GameProfile;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Direction;
@@ -34,7 +34,7 @@ class BiometricCardBakedModel implements BakedModel {
private final BakedModel baseModel;
private final TextureAtlasSprite texture;
private final Sprite texture;
private final int hash;
@@ -42,11 +42,11 @@ class BiometricCardBakedModel implements BakedModel {
private final ImmutableList<BakedQuad> generalQuads;
BiometricCardBakedModel(BakedModel baseModel, TextureAtlasSprite texture) {
BiometricCardBakedModel(BakedModel baseModel, Sprite texture) {
this(baseModel, texture, 0, createCache());
}
private BiometricCardBakedModel(BakedModel baseModel, TextureAtlasSprite texture, int hash,
private BiometricCardBakedModel(BakedModel baseModel, Sprite texture, int hash,
Cache<Integer, BiometricCardBakedModel> modelCache) {
this.baseModel = baseModel;
this.texture = texture;
@@ -110,38 +110,38 @@ class BiometricCardBakedModel implements BakedModel {
}
@Override
public boolean isAmbientOcclusion() {
return this.baseModel.isAmbientOcclusion();
public boolean useAmbientOcclusion() {
return this.baseModel.useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return this.baseModel.isGui3d();
public boolean hasDepth() {
return this.baseModel.hasDepth();
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;// TODO
}
@Override
public boolean isBuiltInRenderer() {
return this.baseModel.isBuiltInRenderer();
public boolean isBuiltin() {
return this.baseModel.isBuiltin();
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.baseModel.getParticleTexture();
public Sprite getSprite() {
return this.baseModel.getSprite();
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return this.baseModel.getItemCameraTransforms();
public ModelTransformation getTransformation() {
return this.baseModel.getTransformation();
}
@Override
public ItemOverrideList getOverrides() {
return new ItemOverrideList() {
public ModelOverrideList getOverrides() {
return new ModelOverrideList() {
@Override
public BakedModel getModelWithOverrides(BakedModel originalModel, ItemStack stack, World world,
LivingEntity entity) {
@@ -182,7 +182,7 @@ class BiometricCardBakedModel implements BakedModel {
}
@Override
public BakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) {
public BakedModel handlePerspective(ModelTransformation.TransformType cameraTransformType, MatrixStack mat) {
baseModel.handlePerspective(cameraTransformType, mat);
return this;
}
src/main/java/appeng/client/render/model/BiometricCardModel.java
+5 -5
View File
@@ -12,11 +12,11 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -42,9 +42,9 @@ public class BiometricCardModel implements IModelGeometry<BiometricCardModel> {
@Nullable
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform transformIn,
ItemOverrideList overrides, Identifier locationIn) {
TextureAtlasSprite texture = spriteGetter.apply(TEXTURE);
Function<Material, Sprite> spriteGetter, IModelTransform transformIn,
ModelOverrideList overrides, Identifier locationIn) {
Sprite texture = spriteGetter.apply(TEXTURE);
BakedModel baseModel = bakery.getBakedModel(MODEL_BASE, transformIn, spriteGetter);
src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java
+20 -20
View File
@@ -8,14 +8,14 @@ import java.util.Random;
import javax.annotation.Nullable;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.PerspectiveMapWrapper;
import net.minecraftforge.client.model.data.EmptyModelData;
@@ -30,8 +30,8 @@ class ColorApplicatorBakedModel implements BakedModel {
private final List<BakedQuad> generalQuads;
ColorApplicatorBakedModel(BakedModel baseModel, IModelTransform transforms, TextureAtlasSprite texDark,
TextureAtlasSprite texMedium, TextureAtlasSprite texBright) {
ColorApplicatorBakedModel(BakedModel baseModel, IModelTransform transforms, Sprite texDark,
Sprite texMedium, Sprite texBright) {
this.baseModel = baseModel;
this.transforms = transforms;
@@ -43,8 +43,8 @@ class ColorApplicatorBakedModel implements BakedModel {
}
}
private List<BakedQuad> fixQuadTint(Direction facing, TextureAtlasSprite texDark, TextureAtlasSprite texMedium,
TextureAtlasSprite texBright) {
private List<BakedQuad> fixQuadTint(Direction facing, Sprite texDark, Sprite texMedium,
Sprite texBright) {
List<BakedQuad> quads = this.baseModel.getQuads(null, facing, new Random(0), EmptyModelData.INSTANCE);
List<BakedQuad> result = new ArrayList<>(quads.size());
for (BakedQuad quad : quads) {
@@ -78,42 +78,42 @@ class ColorApplicatorBakedModel implements BakedModel {
}
@Override
public boolean isAmbientOcclusion() {
return this.baseModel.isAmbientOcclusion();
public boolean useAmbientOcclusion() {
return this.baseModel.useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return this.baseModel.isGui3d();
public boolean hasDepth() {
return this.baseModel.hasDepth();
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;// TODO
}
@Override
public boolean isBuiltInRenderer() {
return this.baseModel.isBuiltInRenderer();
public boolean isBuiltin() {
return this.baseModel.isBuiltin();
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.baseModel.getParticleTexture();
public Sprite getSprite() {
return this.baseModel.getSprite();
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return this.baseModel.getItemCameraTransforms();
public ModelTransformation getTransformation() {
return this.baseModel.getTransformation();
}
@Override
public ItemOverrideList getOverrides() {
public ModelOverrideList getOverrides() {
return this.baseModel.getOverrides();
}
@Override
public BakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) {
public BakedModel handlePerspective(ModelTransformation.TransformType cameraTransformType, MatrixStack mat) {
return PerspectiveMapWrapper.handlePerspective(this, transforms, cameraTransformType, mat);
}
}
src/main/java/appeng/client/render/model/ColorApplicatorModel.java
+7 -7
View File
@@ -10,11 +10,11 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -45,13 +45,13 @@ public class ColorApplicatorModel implements IModelGeometry<ColorApplicatorModel
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
BakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
TextureAtlasSprite texDark = spriteGetter.apply(TEXTURE_DARK);
TextureAtlasSprite texMedium = spriteGetter.apply(TEXTURE_MEDIUM);
TextureAtlasSprite texBright = spriteGetter.apply(TEXTURE_BRIGHT);
Sprite texDark = spriteGetter.apply(TEXTURE_DARK);
Sprite texMedium = spriteGetter.apply(TEXTURE_MEDIUM);
Sprite texBright = spriteGetter.apply(TEXTURE_BRIGHT);
return new ColorApplicatorBakedModel(baseModel, modelTransform, texDark, texMedium, texBright);
}
src/main/java/appeng/client/render/model/DriveBakedModel.java
+2 -2
View File
@@ -32,7 +32,7 @@ import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.item.Item;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
import appeng.api.definitions.IItems;
@@ -89,7 +89,7 @@ public class DriveBakedModel extends DelegateBakedModel {
}
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
// We have faces inside the chassis that are facing east, but should not receive
// ambient occlusion from the east-side, but sadly this cannot be fine-tuned on
// a
src/main/java/appeng/client/render/model/DriveModel.java
+4 -4
View File
@@ -32,10 +32,10 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -57,8 +57,8 @@ public class DriveModel implements IModelGeometry<DriveModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
EnumMap<DriveSlotCellType, BakedModel> cellModels = new EnumMap<>(DriveSlotCellType.class);
// Load the base model and the model for each cell state.
src/main/java/appeng/client/render/model/GlassBakedModel.java
+21 -21
View File
@@ -33,10 +33,10 @@ import com.google.common.base.Strings;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.Identifier;
@@ -47,7 +47,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.BlockView;
import net.minecraft.world.ILightReader;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
@@ -83,18 +83,18 @@ class GlassBakedModel implements IDynamicBakedModel {
.map(rl -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, rl)).toArray(Material[]::new);
}
private final TextureAtlasSprite[] glassTextures;
private final Sprite[] glassTextures;
private final TextureAtlasSprite[] frameTextures;
private final Sprite[] frameTextures;
public GlassBakedModel(Function<Material, TextureAtlasSprite> bakedTextureGetter) {
this.glassTextures = new TextureAtlasSprite[] { bakedTextureGetter.apply(TEXTURE_A),
public GlassBakedModel(Function<Material, Sprite> bakedTextureGetter) {
this.glassTextures = new Sprite[] { bakedTextureGetter.apply(TEXTURE_A),
bakedTextureGetter.apply(TEXTURE_B), bakedTextureGetter.apply(TEXTURE_C),
bakedTextureGetter.apply(TEXTURE_D) };
// The first frame texture would be empty, so we simply leave it set to null
// here
this.frameTextures = new TextureAtlasSprite[16];
this.frameTextures = new Sprite[16];
for (int i = 0; i < TEXTURES_FRAME.length; i++) {
this.frameTextures[1 + i] = bakedTextureGetter.apply(TEXTURES_FRAME[i]);
}
@@ -128,7 +128,7 @@ class GlassBakedModel implements IDynamicBakedModel {
v /= 2;
}
final TextureAtlasSprite glassTexture = this.glassTextures[texIdx];
final Sprite glassTexture = this.glassTextures[texIdx];
// Render the glass side
final List<BakedQuad> quads = new ArrayList<>(5); // At most 5
@@ -147,7 +147,7 @@ class GlassBakedModel implements IDynamicBakedModel {
* indicate this.
*/
final int edgeBitmask = makeBitmask(glassState, side);
final TextureAtlasSprite sideSprite = this.frameTextures[edgeBitmask];
final Sprite sideSprite = this.frameTextures[edgeBitmask];
if (sideSprite != null) {
quads.add(this.createQuad(side, corners, sideSprite, 0, 0));
@@ -157,7 +157,7 @@ class GlassBakedModel implements IDynamicBakedModel {
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
// TODO: Forge: Auto-generated method stub
return false;
}
@@ -204,13 +204,13 @@ class GlassBakedModel implements IDynamicBakedModel {
return bitmask;
}
private BakedQuad createQuad(Direction side, List<Vec3d> corners, TextureAtlasSprite sprite, float uOffset,
float vOffset) {
private BakedQuad createQuad(Direction side, List<Vec3d> corners, Sprite sprite, float uOffset,
float vOffset) {
return this.createQuad(side, corners.get(0), corners.get(1), corners.get(2), corners.get(3), sprite, uOffset,
vOffset);
}
private BakedQuad createQuad(Direction side, Vec3d c1, Vec3d c2, Vec3d c3, Vec3d c4, TextureAtlasSprite sprite,
private BakedQuad createQuad(Direction side, Vec3d c1, Vec3d c2, Vec3d c3, Vec3d c4, Sprite sprite,
float uOffset, float vOffset) {
Vec3d normal = new Vec3d(side.getDirectionVec());
@@ -236,7 +236,7 @@ class GlassBakedModel implements IDynamicBakedModel {
* the vertex elements had been declared in the vertex format.
*/
private void putVertex(BakedQuadBuilder builder, Vec3d normal, double x, double y, double z,
TextureAtlasSprite sprite, float u, float v) {
Sprite sprite, float u, float v) {
VertexFormat vertexFormat = builder.getVertexFormat();
for (int e = 0; e < vertexFormat.getElements().size(); e++) {
VertexFormatElement el = vertexFormat.getElements().get(e);
@@ -266,27 +266,27 @@ class GlassBakedModel implements IDynamicBakedModel {
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
return false;
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture() {
public Sprite getSprite() {
return this.frameTextures[this.frameTextures.length - 1];
}
src/main/java/appeng/client/render/model/GlassModel.java
+4 -4
View File
@@ -28,10 +28,10 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -43,8 +43,8 @@ public class GlassModel implements IModelGeometry<GlassModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
return new GlassBakedModel(spriteGetter);
}
src/main/java/appeng/client/render/model/MatrixVertexTransformer.java
+2 -2
View File
@@ -22,7 +22,7 @@ import java.util.List;
import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.client.renderer.Vector4f;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.math.Direction;
@@ -75,7 +75,7 @@ final class MatrixVertexTransformer extends QuadGatheringTransformer {
}
@Override
public void setTexture(TextureAtlasSprite texture) {
public void setTexture(Sprite texture) {
this.parent.setTexture(texture);
}
src/main/java/appeng/client/render/model/MemoryCardBakedModel.java
+20 -20
View File
@@ -11,14 +11,14 @@ import javax.annotation.Nullable;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Direction;
@@ -37,7 +37,7 @@ class MemoryCardBakedModel implements BakedModel {
private final BakedModel baseModel;
private final TextureAtlasSprite texture;
private final Sprite texture;
private final AEColor[] colorCode;
@@ -45,11 +45,11 @@ class MemoryCardBakedModel implements BakedModel {
private final ImmutableList<BakedQuad> generalQuads;
MemoryCardBakedModel(BakedModel baseModel, TextureAtlasSprite texture) {
MemoryCardBakedModel(BakedModel baseModel, Sprite texture) {
this(baseModel, texture, DEFAULT_COLOR_CODE, createCache());
}
private MemoryCardBakedModel(BakedModel baseModel, TextureAtlasSprite texture, AEColor[] hash,
private MemoryCardBakedModel(BakedModel baseModel, Sprite texture, AEColor[] hash,
Cache<CacheKey, MemoryCardBakedModel> modelCache) {
this.baseModel = baseModel;
this.texture = texture;
@@ -95,38 +95,38 @@ class MemoryCardBakedModel implements BakedModel {
}
@Override
public boolean isAmbientOcclusion() {
return this.baseModel.isAmbientOcclusion();
public boolean useAmbientOcclusion() {
return this.baseModel.useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
return this.baseModel.isGui3d();
public boolean hasDepth() {
return this.baseModel.hasDepth();
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;// TODO
}
@Override
public boolean isBuiltInRenderer() {
return this.baseModel.isBuiltInRenderer();
public boolean isBuiltin() {
return this.baseModel.isBuiltin();
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.baseModel.getParticleTexture();
public Sprite getSprite() {
return this.baseModel.getSprite();
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return this.baseModel.getItemCameraTransforms();
public ModelTransformation getTransformation() {
return this.baseModel.getTransformation();
}
@Override
public ItemOverrideList getOverrides() {
return new ItemOverrideList() {
public ModelOverrideList getOverrides() {
return new ModelOverrideList() {
@Override
public BakedModel getModelWithOverrides(BakedModel originalModel, ItemStack stack, World world,
LivingEntity entity) {
@@ -150,7 +150,7 @@ class MemoryCardBakedModel implements BakedModel {
}
@Override
public BakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) {
public BakedModel handlePerspective(ModelTransformation.TransformType cameraTransformType, MatrixStack mat) {
baseModel.handlePerspective(cameraTransformType, mat);
return this;
}
src/main/java/appeng/client/render/model/MemoryCardModel.java
+5 -5
View File
@@ -12,11 +12,11 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -42,9 +42,9 @@ public class MemoryCardModel implements IModelGeometry<MemoryCardModel> {
@Nullable
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
TextureAtlasSprite texture = spriteGetter.apply(TEXTURE);
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
Sprite texture = spriteGetter.apply(TEXTURE);
BakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
src/main/java/appeng/client/render/model/SkyCompassBakedModel.java
+15 -15
View File
@@ -27,12 +27,12 @@ import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.renderer.Matrix4f;
import net.minecraft.client.renderer.Quaternion;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -40,7 +40,7 @@ import net.minecraft.util.math.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
@@ -112,42 +112,42 @@ public class SkyCompassBakedModel implements IDynamicBakedModel {
}
@Override
public boolean isAmbientOcclusion() {
return this.base.isAmbientOcclusion();
public boolean useAmbientOcclusion() {
return this.base.useAmbientOcclusion();
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return true;
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.base.getParticleTexture();
public Sprite getSprite() {
return this.base.getSprite();
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return this.base.getItemCameraTransforms();
public ModelTransformation getTransformation() {
return this.base.getTransformation();
}
@Override
public ItemOverrideList getOverrides() {
public ModelOverrideList getOverrides() {
/*
* This handles setting the rotation of the compass when being held in hand. If
* it's not held in hand, it'll animate using the spinning animation.
*/
return new ItemOverrideList() {
return new ModelOverrideList() {
@Override
public BakedModel getModelWithOverrides(BakedModel originalModel, ItemStack stack, @Nullable World world,
@Nullable LivingEntity entity) {
src/main/java/appeng/client/render/model/SkyCompassModel.java
+4 -4
View File
@@ -30,10 +30,10 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -54,8 +54,8 @@ public class SkyCompassModel implements IModelGeometry<SkyCompassModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
BakedModel baseModel = bakery.getBakedModel(MODEL_BASE, modelTransform, spriteGetter);
BakedModel pointerModel = bakery.getBakedModel(MODEL_POINTER, modelTransform, spriteGetter);
return new SkyCompassBakedModel(baseModel, pointerModel);
src/main/java/appeng/client/render/model/UVLModelLoader.java
+9 -9
View File
@@ -34,6 +34,8 @@ import com.google.gson.JsonParseException;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
@@ -48,12 +50,10 @@ import net.minecraft.client.render.model.BlockPart;
import net.minecraft.client.render.model.BlockPartFace;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.ItemOverride;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.ItemTransformVec3f;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.math.Direction;
import net.minecraft.util.JSONUtils;
@@ -87,7 +87,7 @@ public class UVLModelLoader implements IModelLoader<UVLModelLoader.UVLModelWrapp
.registerTypeAdapter(BlockPartFace.class, new BlockPartFaceOverrideSerializer())
.registerTypeAdapter(BlockFaceUV.class, new BlockFaceUV.Deserializer())
.registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer())
.registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer())
.registerTypeAdapter(ModelTransformation.class, new ModelTransformation.Deserializer())
.registerTypeAdapter(ItemOverride.class, new ItemOverride.Deserializer())
.registerTypeAdapter(TransformationMatrix.class, new TransformationHelper.Deserializer()).create();
@@ -143,15 +143,15 @@ public class UVLModelLoader implements IModelLoader<UVLModelLoader.UVLModelWrapp
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
TextureAtlasSprite particle = spriteGetter.apply(owner.resolveTexture("particle"));
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
Sprite particle = spriteGetter.apply(owner.resolveTexture("particle"));
IModelBuilder<?> builder = IModelBuilder.of(owner, overrides, particle);
for (BlockPart blockpart : parent.getElements()) {
for (Direction direction : blockpart.mapFaces.keySet()) {
BlockPartFace blockpartface = blockpart.mapFaces.get(direction);
TextureAtlasSprite textureatlassprite1 = spriteGetter
Sprite textureatlassprite1 = spriteGetter
.apply(owner.resolveTexture(blockpartface.texture));
BakedQuad quad = BlockModel.makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction,
modelTransform, modelLocation);
@@ -171,7 +171,7 @@ public class UVLModelLoader implements IModelLoader<UVLModelLoader.UVLModelWrapp
return builder.build();
}
private BakedQuad applyPreBakedLighting(BakedQuad quad, TextureAtlasSprite sprite, float sky, float block) {
private BakedQuad applyPreBakedLighting(BakedQuad quad, Sprite sprite, float sky, float block) {
// FIXME: just piping through the quads and manipulating uv index 2 directly
// seems way easier than this
BakedQuadBuilder builder = new BakedQuadBuilder(sprite);
src/main/java/appeng/client/render/renderable/ItemRenderable.java
+2 -2
View File
@@ -23,10 +23,10 @@ import java.util.function.Function;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.model.json.ModelTransformation;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.renderer.TransformationMatrix;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.item.ItemStack;
public class ItemRenderable<T extends BlockEntity> implements Renderable<T> {
@@ -48,7 +48,7 @@ public class ItemRenderable<T extends BlockEntity> implements Renderable<T> {
matrixStack.push();
}
MinecraftClient.getInstance().getItemRenderer().renderItem(pair.getLeft(),
ItemCameraTransforms.TransformType.GROUND, combinedLight, combinedOverlay, matrixStack, buffers);
ModelTransformation.TransformType.GROUND, combinedLight, combinedOverlay, matrixStack, buffers);
matrixStack.pop();
}
}
src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java
+12 -12
View File
@@ -29,11 +29,11 @@ import com.google.common.collect.ImmutableMap;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.math.Direction;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.tile.spatial.SpatialPylonBlockEntity;
@@ -43,9 +43,9 @@ import appeng.tile.spatial.SpatialPylonBlockEntity;
*/
class SpatialPylonBakedModel implements IDynamicBakedModel {
private final Map<SpatialPylonTextureType, TextureAtlasSprite> textures;
private final Map<SpatialPylonTextureType, Sprite> textures;
SpatialPylonBakedModel(Map<SpatialPylonTextureType, TextureAtlasSprite> textures) {
SpatialPylonBakedModel(Map<SpatialPylonTextureType, Sprite> textures) {
this.textures = ImmutableMap.copyOf(textures);
}
@@ -178,32 +178,32 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {
}
@Override
public boolean func_230044_c_() {
public boolean isSideLit() {
return false;
}
@Override
public boolean isAmbientOcclusion() {
public boolean useAmbientOcclusion() {
return true;
}
@Override
public boolean isGui3d() {
public boolean hasDepth() {
return false;
}
@Override
public boolean isBuiltInRenderer() {
public boolean isBuiltin() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture() {
public Sprite getSprite() {
return this.textures.get(SpatialPylonTextureType.DIM);
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
}
src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
+5 -5
View File
@@ -31,11 +31,11 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.IModelTransform;
import net.minecraft.client.render.model.IUnbakedModel;
import net.minecraft.client.render.model.ItemOverrideList;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
@@ -46,9 +46,9 @@ public class SpatialPylonModel implements IModelGeometry<SpatialPylonModel> {
@Override
public BakedModel bake(IModelConfiguration owner, ModelLoader bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, Identifier modelLocation) {
Map<SpatialPylonTextureType, TextureAtlasSprite> textures = new EnumMap<>(SpatialPylonTextureType.class);
Function<Material, Sprite> spriteGetter, IModelTransform modelTransform,
ModelOverrideList overrides, Identifier modelLocation) {
Map<SpatialPylonTextureType, Sprite> textures = new EnumMap<>(SpatialPylonTextureType.class);
for (SpatialPylonTextureType type : SpatialPylonTextureType.values()) {
textures.put(type, spriteGetter.apply(getTexturePath(type)));
src/main/java/appeng/client/render/tesr/InscriberTESR.java
+6 -6
View File
@@ -4,15 +4,15 @@ package appeng.client.render.tesr;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Quaternion;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.model.ItemCameraTransforms;
import net.minecraft.client.render.model.Material;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.inventory.container.PlayerContainer;
@@ -82,7 +82,7 @@ public final class InscriberTESR extends BlockEntityRenderer<InscriberBlockEntit
final float TwoPx = 2.0f / 16.0f;
final float base = 0.4f;
final TextureAtlasSprite tas = TEXTURE_INSIDE.getSprite();
final Sprite tas = TEXTURE_INSIDE.getSprite();
IVertexBuilder buffer = buffers.getBuffer(RenderLayer.getSolid());
@@ -171,8 +171,8 @@ public final class InscriberTESR extends BlockEntityRenderer<InscriberBlockEntit
ms.pop();
}
private static void addVertex(IVertexBuilder vb, MatrixStack ms, TextureAtlasSprite sprite, float x, float y,
float z, double texU, double texV, int overlayUV, int lightmapUV, Direction front) {
private static void addVertex(IVertexBuilder vb, MatrixStack ms, Sprite sprite, float x, float y,
float z, double texU, double texV, int overlayUV, int lightmapUV, Direction front) {
vb.pos(ms.getLast().getMatrix(), x, y, z);
vb.color(1.0f, 1.0f, 1.0f, 1.0f);
vb.tex(sprite.getInterpolatedU(texU), sprite.getInterpolatedV(texV));
@@ -201,7 +201,7 @@ public final class InscriberTESR extends BlockEntityRenderer<InscriberBlockEntit
ms.scale(0.5f, 0.5f, 0.5f);
}
itemRenderer.renderItem(stack, ItemCameraTransforms.TransformType.FIXED, combinedLight, combinedOverlay, ms,
itemRenderer.renderItem(stack, ModelTransformation.TransformType.FIXED, combinedLight, combinedOverlay, ms,
buffers);
ms.pop();
}