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

Server can at least begin to launch now.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-08-02 15:45:59 +02:00
parent 80375c436d
commit a97ebaf40d
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java
+17 -13
View File
@@ -1,28 +1,32 @@
package appeng.block.crafting; package appeng.block.crafting;
import net.minecraft.client.renderer.RenderType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.BlockRenderingCustomizer;
import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IBlockRendering;
import appeng.bootstrap.IItemRendering; import appeng.bootstrap.IItemRendering;
import appeng.client.render.crafting.MonitorBakedModel; import appeng.client.render.crafting.MonitorBakedModel;
import appeng.client.render.model.AutoRotatingBakedModel; import appeng.client.render.model.AutoRotatingBakedModel;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.util.Identifier;
public class CraftingMonitorBlockRendering extends BlockRenderingCustomizer { public class CraftingMonitorBlockRendering extends BlockRenderingCustomizer {
@Override @Override
@OnlyIn(Dist.CLIENT) @Environment(EnvType.CLIENT)
public void customize(IBlockRendering rendering, IItemRendering itemRendering) { public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
rendering.renderType(RenderType.getCutout()); rendering.renderType(RenderLayer.getCutout());
rendering.modelCustomizer((path, model) -> { rendering.modelCustomizer(CraftingMonitorBlockRendering::customizeModel);
// The formed model handles rotations itself, the unformed one does not }
if (model instanceof MonitorBakedModel) {
return model; @Environment(EnvType.CLIENT)
} private static BakedModel customizeModel(Identifier path, BakedModel model) {
return new AutoRotatingBakedModel(model); // The formed model handles rotations itself, the unformed one does not
}); if (model instanceof MonitorBakedModel) {
return model;
}
return new AutoRotatingBakedModel(model);
} }
} }
src/main/java/appeng/client/render/tesr/ChargerTESR.java
+10 -9
View File
@@ -5,26 +5,27 @@ import java.util.function.Function;
import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.minecraft.client.render.model.json.Transformation;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
import appeng.client.render.renderable.ItemRenderable; import appeng.client.render.renderable.ItemRenderable;
import appeng.tile.misc.ChargerTileEntity; import appeng.tile.misc.ChargerBlockEntity;
public final class ChargerTESR { public final class ChargerTESR {
private ChargerTESR() { private ChargerTESR() {
} }
public static Function<TileEntityRendererDispatcher, TileEntityRenderer<ChargerTileEntity>> FACTORY = dispatcher -> new ModularTESR<>( public static Function<BlockEntityRenderDispatcher, BlockEntityRenderer<ChargerBlockEntity>> FACTORY = dispatcher -> new ModularTESR<>(
dispatcher, new ItemRenderable<>(ChargerTESR::getRenderedItem)); dispatcher, new ItemRenderable<>(ChargerTESR::getRenderedItem));
private static Pair<ItemStack, TransformationMatrix> getRenderedItem(ChargerTileEntity tile) { private static Pair<ItemStack, Transformation> getRenderedItem(ChargerBlockEntity tile) {
TransformationMatrix transform = new TransformationMatrix(new Vector3f(0.5f, 0.375f, 0.5f), null, null, null); Transformation transform = new Transformation(new Vector3f(), new Vector3f(0.5f, 0.375f, 0.5f),
return new ImmutablePair<>(tile.getInternalInventory().getStackInSlot(0), transform); new Vector3f(1f, 1f, 1f));
return new ImmutablePair<>(tile.getInternalInventory().getInvStack(0), transform);
} }
} }