diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java index 3ef581159..d61a56045 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java @@ -43,7 +43,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.nbt.Tag; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.ItemHandlerHelper; @@ -59,9 +58,7 @@ public class Network implements INetwork, IRedstoneConfigurable { private static final int THROTTLE_ACTIVE_TO_INACTIVE = 4; private static final String NBT_ENERGY = "Energy"; - private static final String NBT_ITEM_STORAGE_TRACKER = "ItemStorageTracker"; //TODO: remove next version private static final String NBT_ITEM_STORAGE_TRACKER_ID = "ItemStorageTrackerId"; - private static final String NBT_FLUID_STORAGE_TRACKER = "FluidStorageTracker"; //TODO: remove next version private static final String NBT_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId"; private static final Logger LOGGER = LogManager.getLogger(Network.class); @@ -522,18 +519,10 @@ public class Network implements INetwork, IRedstoneConfigurable { if (tag.contains(NBT_ITEM_STORAGE_TRACKER_ID)) { this.itemStorageTrackerId = tag.getUUID(NBT_ITEM_STORAGE_TRACKER_ID); - } else { - if (tag.contains(NBT_ITEM_STORAGE_TRACKER)) { //TODO: remove next version - getItemStorageTracker().readFromNbt(tag.getList(NBT_ITEM_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } } if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) { this.fluidStorageTrackerId = tag.getUUID(NBT_FLUID_STORAGE_TRACKER_ID); - } else { - if (tag.contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version - getFluidStorageTracker().readFromNbt(tag.getList(NBT_FLUID_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } } return this; diff --git a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java index 94300e9c5..1ea330ac3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java +++ b/src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java @@ -4,7 +4,6 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.blaze3d.vertex.VertexFormatElement; import com.mojang.math.Vector3f; -import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.Direction; @@ -42,12 +41,6 @@ public class CubeBuilder { return this; } - public CubeBuilder lightmap() { - this.format = RenderUtils.getFormatWithLightMap(format); - - return this; - } - public CubeBuilder addFaces(Function faceSupplier) { for (Direction facing : Direction.values()) { addFace(faceSupplier.apply(facing)); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java index 96be104c9..0fec94e72 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -437,7 +437,6 @@ public class GridScreen extends BaseScreen implements IScreenInfo int color = grid.isGridActive() ? -2130706433 : 0xFF5B5B5B; matrixStack.pushPose(); - // TODO RenderSystem.disableLighting(); RenderSystem.disableDepthTest(); RenderSystem.colorMask(true, true, true, false); fillGradient(matrixStack, x, y, x + 16, y + 16, color, color); diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java index 387abede3..ccc256365 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java @@ -49,7 +49,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.ItemStack; -import net.minecraft.nbt.Tag; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.items.IItemHandlerModifiable; @@ -60,9 +59,7 @@ import java.util.List; import java.util.UUID; public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainerContext { - static final String NBT_STORAGE_TRACKER = "StorageTracker"; //TODO: remove next version static final String NBT_ITEM_STORAGE_TRACKER_ID = "ItemStorageTrackerId"; - static final String NBT_FLUID_STORAGE_TRACKER = "FluidStorageTracker"; // TODO: remove next version static final String NBT_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId"; private final PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this); private final PortableFluidGridHandler fluidHandler = new PortableFluidGridHandler(this); @@ -114,10 +111,6 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer if (stack.getTag().contains(NBT_ITEM_STORAGE_TRACKER_ID)) { itemStorageTrackerId = stack.getTag().getUUID(NBT_ITEM_STORAGE_TRACKER_ID); } else { - if (stack.getTag().contains(NBT_STORAGE_TRACKER)) { //TODO: remove next version - getItemStorageTracker().readFromNbt(stack.getTag().getList(NBT_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } - UUID id = UUID.randomUUID(); stack.getTag().putUUID(NBT_ITEM_STORAGE_TRACKER_ID, id); itemStorageTrackerId = id; @@ -126,10 +119,6 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer if (stack.getTag().contains(NBT_FLUID_STORAGE_TRACKER_ID)) { fluidStorageTrackerId = stack.getTag().getUUID(NBT_FLUID_STORAGE_TRACKER_ID); } else { - if (stack.getTag().contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version - getFluidStorageTracker().readFromNbt(stack.getTag().getList(NBT_FLUID_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } - UUID id = UUID.randomUUID(); stack.getTag().putUUID(NBT_FLUID_STORAGE_TRACKER_ID, id); fluidStorageTrackerId = id; diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java index 460896d3b..728cada38 100644 --- a/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java +++ b/src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java @@ -63,7 +63,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; @@ -117,9 +116,7 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, } }); - private static final String NBT_STORAGE_TRACKER = "StorageTracker"; //TODO: remove next version private static final String NBT_ITEM_STORAGE_TRACKER_ID = "ItemStorageTrackerId"; - private static final String NBT_FLUID_STORAGE_TRACKER = "FluidStorageTracker"; //TODO: remove next version private static final String NBT_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId"; private static final String NBT_TYPE = "Type"; private static final String NBT_ENERGY = "Energy"; @@ -243,18 +240,10 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, this.redstoneMode = RedstoneMode.read(stack.getTag()); if (stack.getTag().contains(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID)) { itemStorageTrackerId = stack.getTag().getUUID(NBT_ITEM_STORAGE_TRACKER_ID); - } else { - if (stack.getTag().contains(PortableGrid.NBT_STORAGE_TRACKER)) { //TODO: remove next version - getItemStorageTracker().readFromNbt(stack.getTag().getList(PortableGrid.NBT_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } } if (stack.getTag().contains(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID)) { fluidStorageTrackerId = stack.getTag().getUUID(NBT_FLUID_STORAGE_TRACKER_ID); - } else { - if (stack.getTag().contains(PortableGrid.NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version - getFluidStorageTracker().readFromNbt(stack.getTag().getList(PortableGrid.NBT_FLUID_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } } if (stack.getTag().contains(NBT_ENCHANTMENTS)) { @@ -715,18 +704,10 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid, if (tag.contains(NBT_ITEM_STORAGE_TRACKER_ID)) { itemStorageTrackerId = tag.getUUID(NBT_ITEM_STORAGE_TRACKER_ID); - } else { - if (tag.contains(NBT_STORAGE_TRACKER)) { //TODO: remove next version - getItemStorageTracker().readFromNbt(tag.getList(NBT_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } } if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) { fluidStorageTrackerId = tag.getUUID(NBT_FLUID_STORAGE_TRACKER_ID); - } else { - if (tag.contains(NBT_FLUID_STORAGE_TRACKER)) { //TODO: remove next version - getFluidStorageTracker().readFromNbt(tag.getList(NBT_FLUID_STORAGE_TRACKER, Tag.TAG_COMPOUND)); - } } if (tag.contains(NBT_ENCHANTMENTS)) { diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index a463f425a..b1b3dca0c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -1,11 +1,7 @@ package com.refinedmods.refinedstorage.util; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.blaze3d.vertex.VertexFormatElement; import com.mojang.math.Quaternion; import com.mojang.math.Transformation; import com.mojang.math.Vector3f; @@ -114,7 +110,7 @@ public final class RenderUtils { // @Volatile: Copied with some tweaks from GuiUtils#drawHoveringText(@Nonnull final ItemStack stack, List textLines, int mouseX, int mouseY, int screenWidth, int screenHeight, int maxTextWidth, FontRenderer font) public static void drawTooltipWithSmallText(PoseStack matrixStack, List textLines, List smallTextLines, boolean showSmallText, @Nonnull ItemStack stack, int mouseX, int mouseY, int screenWidth, int screenHeight, Font fontRenderer) { - // TODO + // TODO } // @Volatile: From Screen#getTooltipFromItem @@ -127,24 +123,6 @@ public final class RenderUtils { return ox >= x && ox <= x + w && oy >= y && oy <= y + h; } - public static boolean isLightMapDisabled() { - return false; - } - - public static VertexFormat getFormatWithLightMap(VertexFormat format) { - if (isLightMapDisabled()) { - return format; - } - - if (format == DefaultVertexFormat.BLOCK) { - return DefaultVertexFormat.BLOCK; - } else if (!format.hasUV(1)) { - // TODO return new VertexFormat(ImmutableList.builder().addAll(format.getElements()).add(DefaultVertexFormat.ELEMENT_UV1).build()); - } - - return format; - } - public static TextureAtlasSprite getSprite(BakedModel coverModel, BlockState coverState, Direction facing, Random rand) { TextureAtlasSprite sprite = null;