From 5b26057dc1ce3d24a2f1d5510f8acaa7ed3abf8d Mon Sep 17 00:00:00 2001 From: Buuz135 Date: Sun, 12 Sep 2021 23:44:04 +0200 Subject: [PATCH] Added some comments to easily check what I changed from the straight copied files --- .../apiimpl/network/node/cover/CoverManager.java | 2 +- .../java/com/refinedmods/refinedstorage/item/CoverItem.java | 2 +- .../refinedstorage/render/model/BakedModelCableCover.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java index 37b7ae91e..0107de823 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/cover/CoverManager.java @@ -149,7 +149,7 @@ public class CoverManager { BlockState state = getBlockState(item); - return block != null && state != null && ((isModelSupported(state) && !block.ticksRandomly(state) && !block.hasTileEntity(state) && !state.isTransparent())); //Removed is top solid as it needs world param + return block != null && state != null && ((isModelSupported(state) && !block.ticksRandomly(state) && !block.hasTileEntity(state) && !state.isTransparent())); //Changed from 1.12: to use 1.16 methods } private static boolean isModelSupported(BlockState state) { diff --git a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java index 740cc5871..e71e9a36f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/CoverItem.java @@ -73,7 +73,7 @@ public class CoverItem extends Item { @Override public void fillItemGroup(ItemGroup group, NonNullList items) { - if (this.isInGroup(group)) { + if (this.isInGroup(group)) { //Changed from 1.12: to use 1.16 configs if (!RS.CLIENT_CONFIG.getCover().showAllRecipesInJEI()) { ItemStack stack = new ItemStack(this); diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java index 5db3a1c1e..da2364919 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/BakedModelCableCover.java @@ -137,7 +137,7 @@ public class BakedModelCableCover extends DelegateBakedModel{ } } - HashMap spriteCache = new HashMap<>(); + HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side quads.addAll(new CubeBuilder().from(from.getX(), from.getY(), from.getZ()).to(to.getX(), to.getY(), to.getZ()).addFaces(face -> new CubeBuilder.Face(face, spriteCache.computeIfAbsent(face, direction -> RenderUtils.getSprite(Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state), state, direction, random)))).bake()); if (handle) { @@ -197,7 +197,7 @@ public class BakedModelCableCover extends DelegateBakedModel{ from.setZ(16 - size); to.setZ(16); } - HashMap spriteCache = new HashMap<>(); + HashMap spriteCache = new HashMap<>(); //Changed from 1.12: to improve sprite getting for each side quads.addAll(new CubeBuilder() .from(from.getX(), from.getY(), from.getZ()) .to(to.getX(), to.getY(), to.getZ())