dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
raoulvdberge
2021-12-12 22:06:22 +01:00
parent 2358013b06
commit 2780f8529c
6 changed files with 1 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
View File

@@ -43,7 +43,6 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.nbt.Tag;
import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.items.ItemHandlerHelper; 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 int THROTTLE_ACTIVE_TO_INACTIVE = 4;
private static final String NBT_ENERGY = "Energy"; 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_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_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId";
private static final Logger LOGGER = LogManager.getLogger(Network.class); 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)) { if (tag.contains(NBT_ITEM_STORAGE_TRACKER_ID)) {
this.itemStorageTrackerId = tag.getUUID(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)) { if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) {
this.fluidStorageTrackerId = tag.getUUID(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; return this;

7
src/main/java/com/refinedmods/refinedstorage/render/model/CubeBuilder.java
View File

@@ -4,7 +4,6 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat; import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement; import com.mojang.blaze3d.vertex.VertexFormatElement;
import com.mojang.math.Vector3f; import com.mojang.math.Vector3f;
import com.refinedmods.refinedstorage.util.RenderUtils;
import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
@@ -42,12 +41,6 @@ public class CubeBuilder {
return this; return this;
} }
public CubeBuilder lightmap() {
this.format = RenderUtils.getFormatWithLightMap(format);
return this;
}
public CubeBuilder addFaces(Function<Direction, Face> faceSupplier) { public CubeBuilder addFaces(Function<Direction, Face> faceSupplier) {
for (Direction facing : Direction.values()) { for (Direction facing : Direction.values()) {
addFace(faceSupplier.apply(facing)); addFace(faceSupplier.apply(facing));

1
src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
View File

@@ -437,7 +437,6 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
int color = grid.isGridActive() ? -2130706433 : 0xFF5B5B5B; int color = grid.isGridActive() ? -2130706433 : 0xFF5B5B5B;
matrixStack.pushPose(); matrixStack.pushPose();
// TODO RenderSystem.disableLighting();
RenderSystem.disableDepthTest(); RenderSystem.disableDepthTest();
RenderSystem.colorMask(true, true, true, false); RenderSystem.colorMask(true, true, true, false);
fillGradient(matrixStack, x, y, x + 16, y + 16, color, color); fillGradient(matrixStack, x, y, x + 16, y + 16, color, color);

11
src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGrid.java
View File

@@ -49,7 +49,6 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.inventory.ResultContainer;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.nbt.Tag;
import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.energy.IEnergyStorage;
import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.IItemHandlerModifiable;
@@ -60,9 +59,7 @@ import java.util.List;
import java.util.UUID; import java.util.UUID;
public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainerContext { 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_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"; static final String NBT_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId";
private final PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this); private final PortableItemGridHandler itemHandler = new PortableItemGridHandler(this, this);
private final PortableFluidGridHandler fluidHandler = new PortableFluidGridHandler(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)) { if (stack.getTag().contains(NBT_ITEM_STORAGE_TRACKER_ID)) {
itemStorageTrackerId = stack.getTag().getUUID(NBT_ITEM_STORAGE_TRACKER_ID); itemStorageTrackerId = stack.getTag().getUUID(NBT_ITEM_STORAGE_TRACKER_ID);
} else { } 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(); UUID id = UUID.randomUUID();
stack.getTag().putUUID(NBT_ITEM_STORAGE_TRACKER_ID, id); stack.getTag().putUUID(NBT_ITEM_STORAGE_TRACKER_ID, id);
itemStorageTrackerId = id; itemStorageTrackerId = id;
@@ -126,10 +119,6 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer
if (stack.getTag().contains(NBT_FLUID_STORAGE_TRACKER_ID)) { if (stack.getTag().contains(NBT_FLUID_STORAGE_TRACKER_ID)) {
fluidStorageTrackerId = stack.getTag().getUUID(NBT_FLUID_STORAGE_TRACKER_ID); fluidStorageTrackerId = stack.getTag().getUUID(NBT_FLUID_STORAGE_TRACKER_ID);
} else { } 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(); UUID id = UUID.randomUUID();
stack.getTag().putUUID(NBT_FLUID_STORAGE_TRACKER_ID, id); stack.getTag().putUUID(NBT_FLUID_STORAGE_TRACKER_ID, id);
fluidStorageTrackerId = id; fluidStorageTrackerId = id;

19
src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
View File

@@ -63,7 +63,6 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.inventory.ResultContainer; import net.minecraft.world.inventory.ResultContainer;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional; 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_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_FLUID_STORAGE_TRACKER_ID = "FluidStorageTrackerId";
private static final String NBT_TYPE = "Type"; private static final String NBT_TYPE = "Type";
private static final String NBT_ENERGY = "Energy"; 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()); this.redstoneMode = RedstoneMode.read(stack.getTag());
if (stack.getTag().contains(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID)) { if (stack.getTag().contains(PortableGrid.NBT_ITEM_STORAGE_TRACKER_ID)) {
itemStorageTrackerId = stack.getTag().getUUID(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)) { if (stack.getTag().contains(PortableGrid.NBT_FLUID_STORAGE_TRACKER_ID)) {
fluidStorageTrackerId = stack.getTag().getUUID(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)) { 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)) { if (tag.contains(NBT_ITEM_STORAGE_TRACKER_ID)) {
itemStorageTrackerId = tag.getUUID(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)) { if (tag.contains(NBT_FLUID_STORAGE_TRACKER_ID)) {
fluidStorageTrackerId = tag.getUUID(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)) { if (tag.contains(NBT_ENCHANTMENTS)) {

22
src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java
View File

@@ -1,11 +1,7 @@
package com.refinedmods.refinedstorage.util; package com.refinedmods.refinedstorage.util;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.PoseStack; 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.Quaternion;
import com.mojang.math.Transformation; import com.mojang.math.Transformation;
import com.mojang.math.Vector3f; import com.mojang.math.Vector3f;
@@ -127,24 +123,6 @@ public final class RenderUtils {
return ox >= x && ox <= x + w && oy >= y && oy <= y + h; 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.<VertexFormatElement>builder().addAll(format.getElements()).add(DefaultVertexFormat.ELEMENT_UV1).build());
}
return format;
}
public static TextureAtlasSprite getSprite(BakedModel coverModel, BlockState coverState, Direction facing, Random rand) { public static TextureAtlasSprite getSprite(BakedModel coverModel, BlockState coverState, Direction facing, Random rand) {
TextureAtlasSprite sprite = null; TextureAtlasSprite sprite = null;