From e1f9e014042bfd7ad05d0327faa0591810c0f62e Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 00:16:33 +0200 Subject: [PATCH 01/19] Force cluster-rebuilds on the first detected change, if their bounds do not match. Also use a client-side method to update connected textures for crafting cubes if two previously distinct clusters are connected. Refactored MBCalculator to use generics for type checks and remove more casts. --- .../crafting/AbstractCraftingUnitBlock.java | 13 +++ .../implementations/CraftingCPUContainer.java | 3 +- .../java/appeng/me/cluster/IAEMultiBlock.java | 4 +- .../java/appeng/me/cluster/MBCalculator.java | 96 ++++++++-------- .../CraftingCPUCalculator.java | 60 ++++------ .../implementations/CraftingCPUCluster.java | 38 +++---- .../implementations/QuantumCalculator.java | 103 +++++++----------- .../implementations/QuantumCluster.java | 7 +- .../SpatialPylonCalculator.java | 56 +++------- .../tile/crafting/CraftingTileEntity.java | 21 ++-- .../tile/qnb/QuantumBridgeTileEntity.java | 14 +-- .../tile/spatial/SpatialPylonTileEntity.java | 10 +- 12 files changed, 178 insertions(+), 247 deletions(-) diff --git a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java index 9158d3fc4..2b0b40e2b 100644 --- a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java +++ b/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java @@ -23,10 +23,13 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; @@ -54,6 +57,16 @@ public abstract class AbstractCraftingUnitBlock ex builder.add(FORMED); } + @Override + public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, + BlockPos currentPos, BlockPos facingPos) { + TileEntity te = worldIn.getTileEntity(currentPos); + if (te != null) { + te.requestModelDataUpdate(); + } + return super.updatePostPlacement(stateIn, facing, facingState, worldIn, currentPos, facingPos); + } + @Override public void neighborChanged(final BlockState state, final World worldIn, final BlockPos pos, final Block blockIn, final BlockPos fromPos, boolean isMoving) { diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java index 4e481237f..fabc5939a 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java +++ b/src/main/java/appeng/container/implementations/CraftingCPUContainer.java @@ -47,7 +47,6 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.core.sync.packets.MEInventoryUpdatePacket; import appeng.helpers.ICustomNameObject; -import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.tile.crafting.CraftingTileEntity; import appeng.util.Platform; @@ -82,7 +81,7 @@ public class CraftingCPUContainer extends AEBaseContainer } if (te instanceof CraftingTileEntity) { - this.setCPU((ICraftingCPU) ((IAEMultiBlock) te).getCluster()); + this.setCPU(((CraftingTileEntity) te).getCluster()); } if (this.getNetwork() == null && Platform.isServer()) { diff --git a/src/main/java/appeng/me/cluster/IAEMultiBlock.java b/src/main/java/appeng/me/cluster/IAEMultiBlock.java index a78898855..48a9427c6 100644 --- a/src/main/java/appeng/me/cluster/IAEMultiBlock.java +++ b/src/main/java/appeng/me/cluster/IAEMultiBlock.java @@ -18,11 +18,11 @@ package appeng.me.cluster; -public interface IAEMultiBlock { +public interface IAEMultiBlock { void disconnect(boolean b); - IAECluster getCluster(); + Cluster getCluster(); boolean isValid(); } diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index 5c6110df0..98e5e0dcb 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -25,17 +25,21 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import appeng.api.util.AEPartLocation; -import appeng.api.util.WorldCoord; import appeng.core.AELog; import appeng.util.Platform; -public abstract class MBCalculator { +public abstract class MBCalculator, TCluster extends IAECluster> { + /** + * To avoid recursive cluster rebuilds, we use a global field to prevent this + * from happening. This is set to the cluster that is currently causing a + * Multiblock modification. + */ private static WeakReference modificationInProgress = new WeakReference<>(null); - private final IAEMultiBlock target; + protected final TTile target; - public MBCalculator(final IAEMultiBlock t) { + public MBCalculator(final TTile t) { this.target = t; } @@ -54,10 +58,10 @@ public abstract class MBCalculator { return modificationInProgress.get() != null; } - public void updateMultiblockAfterNeighborUpdate(final World world, final WorldCoord loc, BlockPos changedPos) { + public void updateMultiblockAfterNeighborUpdate(final World world, final BlockPos loc, BlockPos changedPos) { boolean recheck; - IAECluster cluster = target.getCluster(); + TCluster cluster = target.getCluster(); if (cluster != null) { if (isWithinBounds(changedPos, cluster.getBoundsMin(), cluster.getBoundsMax())) { // If the location is part of the current multiblock, always re-check @@ -69,9 +73,8 @@ public abstract class MBCalculator { } } else { // Always recheck if the tile is not part of a cluster, because the adjacent - // block could have - // previously been a valid tile, but in a wrong placement, or the other way - // around. + // block could have previously been a valid tile, but in a wrong placement, + // or the other way around. recheck = true; } @@ -80,7 +83,7 @@ public abstract class MBCalculator { } } - public void calculateMultiblock(final World world, final WorldCoord loc) { + public void calculateMultiblock(final World world, final BlockPos loc) { if (Platform.isClient() || isModificationInProgress()) { return; } @@ -92,34 +95,31 @@ public abstract class MBCalculator { } try { - final WorldCoord min = loc.copy(); - final WorldCoord max = loc.copy(); + final BlockPos.Mutable min = new BlockPos.Mutable(loc); + final BlockPos.Mutable max = new BlockPos.Mutable(loc); // find size of MB structure... - while (this.isValidTileAt(world, min.x - 1, min.y, min.z)) { - min.x--; + while (this.isValidTileAt(world, min.getX() - 1, min.getY(), min.getZ())) { + min.setX(min.getX() - 1); } - while (this.isValidTileAt(world, min.x, min.y - 1, min.z)) { - min.y--; + while (this.isValidTileAt(world, min.getX(), min.getY() - 1, min.getZ())) { + min.setY(min.getY() - 1); } - while (this.isValidTileAt(world, min.x, min.y, min.z - 1)) { - min.z--; + while (this.isValidTileAt(world, min.getX(), min.getY(), min.getZ() - 1)) { + min.setZ(min.getZ() - 1); } - while (this.isValidTileAt(world, max.x + 1, max.y, max.z)) { - max.x++; + while (this.isValidTileAt(world, max.getX() + 1, max.getY(), max.getZ())) { + max.setX(max.getX() + 1); } - while (this.isValidTileAt(world, max.x, max.y + 1, max.z)) { - max.y++; + while (this.isValidTileAt(world, max.getX(), max.getY() + 1, max.getZ())) { + max.setY(max.getY() + 1); } - while (this.isValidTileAt(world, max.x, max.y, max.z + 1)) { - max.z++; + while (this.isValidTileAt(world, max.getX(), max.getY(), max.getZ() + 1)) { + max.setZ(max.getZ() + 1); } if (this.checkMultiblockScale(min, max)) { if (this.verifyUnownedRegion(world, min, max)) { - IAECluster c = this.createCluster(world, min, max); - setModificationInProgress(c); - try { if (!this.verifyInternalStructure(world, min, max)) { this.disconnect(); @@ -131,16 +131,19 @@ public abstract class MBCalculator { } boolean updateGrid = false; - final IAECluster cluster = this.target.getCluster(); - if (cluster == null) { - this.updateTiles(c, world, min, max); + TCluster cluster = this.target.getCluster(); + if (cluster == null || !cluster.getBoundsMin().equals(min) || !cluster.getBoundsMax().equals(max)) { + cluster = this.createCluster(world, min, max); + setModificationInProgress(cluster); + // NOTE: The following will break existing clusters within the bounds + this.updateTiles(cluster, world, min, max); updateGrid = true; } else { - c = cluster; + setModificationInProgress(cluster); } - c.updateStatus(updateGrid); + cluster.updateStatus(updateGrid); return; } } @@ -173,11 +176,12 @@ public abstract class MBCalculator { * * @return true if structure has correct dimensions or size */ - public abstract boolean checkMultiblockScale(WorldCoord min, WorldCoord max); + public abstract boolean checkMultiblockScale(BlockPos min, BlockPos max); - private boolean verifyUnownedRegion(final World w, final WorldCoord min, final WorldCoord max) { + private boolean verifyUnownedRegion(final World w, final BlockPos min, final BlockPos max) { for (final AEPartLocation side : AEPartLocation.SIDE_LOCATIONS) { - if (this.verifyUnownedRegionInner(w, min.x, min.y, min.z, max.x, max.y, max.z, side)) { + if (this.verifyUnownedRegionInner(w, min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getZ(), + side)) { return false; } } @@ -194,14 +198,16 @@ public abstract class MBCalculator { * * @return created cluster */ - public abstract IAECluster createCluster(World w, WorldCoord min, WorldCoord max); + public abstract TCluster createCluster(World w, BlockPos min, BlockPos max); - public abstract boolean verifyInternalStructure(World world, WorldCoord min, WorldCoord max); + public abstract boolean verifyInternalStructure(World world, BlockPos min, BlockPos max); /** * disassembles the multi-block. */ - public abstract void disconnect(); + public void disconnect() { + this.target.disconnect(true); + } /** * configure the multi-block tiles, most of the important stuff is in here. @@ -211,7 +217,7 @@ public abstract class MBCalculator { * @param min min world coord * @param max max world coord */ - public abstract void updateTiles(IAECluster c, World w, WorldCoord min, WorldCoord max); + public abstract void updateTiles(TCluster c, World w, BlockPos min, BlockPos max); /** * check if the tile entities are correct for the structure. @@ -253,14 +259,10 @@ public abstract class MBCalculator { return false; } - for (int x = minX; x <= maxX; x++) { - for (int y = minY; y <= maxY; y++) { - for (int z = minZ; z <= maxZ; z++) { - final TileEntity te = w.getTileEntity(new BlockPos(x, y, z)); - if (this.isValidTile(te)) { - return true; - } - } + for (BlockPos p : BlockPos.getAllInBoxMutable(minX, minY, minZ, maxX, maxY, maxZ)) { + final TileEntity te = w.getTileEntity(p); + if (this.isValidTile(te)) { + return true; } } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 887f0a97d..2a81b4cdf 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -29,32 +29,27 @@ import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkCraftingCpuChange; import appeng.api.util.AEPartLocation; -import appeng.api.util.WorldCoord; -import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; import appeng.tile.crafting.CraftingTileEntity; -public class CraftingCPUCalculator extends MBCalculator { +public class CraftingCPUCalculator extends MBCalculator { - private final CraftingTileEntity tqb; - - public CraftingCPUCalculator(final IAEMultiBlock t) { + public CraftingCPUCalculator(final CraftingTileEntity t) { super(t); - this.tqb = (CraftingTileEntity) t; } @Override - public boolean checkMultiblockScale(final WorldCoord min, final WorldCoord max) { - if (max.x - min.x > 16) { + public boolean checkMultiblockScale(final BlockPos min, final BlockPos max) { + if (max.getX() - min.getX() > 16) { return false; } - if (max.y - min.y > 16) { + if (max.getY() - min.getY() > 16) { return false; } - if (max.z - min.z > 16) { + if (max.getZ() - min.getZ() > 16) { return false; } @@ -62,27 +57,23 @@ public class CraftingCPUCalculator extends MBCalculator { } @Override - public IAECluster createCluster(final World w, final WorldCoord min, final WorldCoord max) { + public CraftingCPUCluster createCluster(final World w, final BlockPos min, final BlockPos max) { return new CraftingCPUCluster(min, max); } @Override - public boolean verifyInternalStructure(final World w, final WorldCoord min, final WorldCoord max) { + public boolean verifyInternalStructure(final World w, final BlockPos min, final BlockPos max) { boolean storage = false; - for (int x = min.x; x <= max.x; x++) { - for (int y = min.y; y <= max.y; y++) { - for (int z = min.z; z <= max.z; z++) { - final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(new BlockPos(x, y, z)); + for (BlockPos blockPos : BlockPos.getAllInBoxMutable(min, max)) { + final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(blockPos); - if (!te.isValid()) { - return false; - } + if (te == null || !te.isValid()) { + return false; + } - if (!storage && te instanceof CraftingTileEntity) { - storage = ((CraftingTileEntity) te).getStorageBytes() > 0; - } - } + if (!storage && te instanceof CraftingTileEntity) { + storage = ((CraftingTileEntity) te).getStorageBytes() > 0; } } @@ -90,22 +81,11 @@ public class CraftingCPUCalculator extends MBCalculator { } @Override - public void disconnect() { - this.tqb.disconnect(true); - } - - @Override - public void updateTiles(final IAECluster cl, final World w, final WorldCoord min, final WorldCoord max) { - final CraftingCPUCluster c = (CraftingCPUCluster) cl; - - for (int x = min.x; x <= max.x; x++) { - for (int y = min.y; y <= max.y; y++) { - for (int z = min.z; z <= max.z; z++) { - final CraftingTileEntity te = (CraftingTileEntity) w.getTileEntity(new BlockPos(x, y, z)); - te.updateStatus(c); - c.addTile(te); - } - } + public void updateTiles(final CraftingCPUCluster c, final World w, final BlockPos min, final BlockPos max) { + for (BlockPos blockPos : BlockPos.getAllInBoxMutable(min, max)) { + final CraftingTileEntity te = (CraftingTileEntity) w.getTileEntity(blockPos); + te.updateStatus(c); + c.addTile(te); } c.done(); diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 7260e8f1e..97c93c8fb 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -18,12 +18,7 @@ package appeng.me.cluster.implementations; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; import com.google.common.collect.ImmutableList; @@ -45,14 +40,7 @@ import appeng.api.crafting.ICraftingHelper; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.CraftingItemList; -import appeng.api.networking.crafting.ICraftingCPU; -import appeng.api.networking.crafting.ICraftingGrid; -import appeng.api.networking.crafting.ICraftingJob; -import appeng.api.networking.crafting.ICraftingLink; -import appeng.api.networking.crafting.ICraftingMedium; -import appeng.api.networking.crafting.ICraftingPatternDetails; -import appeng.api.networking.crafting.ICraftingRequester; +import appeng.api.networking.crafting.*; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.events.MENetworkCraftingCpuChange; import appeng.api.networking.security.IActionSource; @@ -62,15 +50,10 @@ import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; -import appeng.api.util.WorldCoord; import appeng.container.ContainerNull; import appeng.core.AELog; import appeng.core.Api; -import appeng.crafting.CraftBranchFailure; -import appeng.crafting.CraftingJob; -import appeng.crafting.CraftingLink; -import appeng.crafting.CraftingWatcher; -import appeng.crafting.MECraftingInventory; +import appeng.crafting.*; import appeng.me.cache.CraftingGridCache; import appeng.me.cluster.IAECluster; import appeng.me.cluster.MBCalculator; @@ -116,9 +99,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { private long startItemCount; private long remainingItemCount; - public CraftingCPUCluster(final WorldCoord boundsMin, final WorldCoord boundsMax) { - this.boundsMin = boundsMin.getBlockPos(); - this.boundsMax = boundsMax.getBlockPos(); + public CraftingCPUCluster(final BlockPos boundsMin, final BlockPos boundsMax) { + this.boundsMin = boundsMin.toImmutable(); + this.boundsMax = boundsMax.toImmutable(); } @Override @@ -175,7 +158,10 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } this.isDestroyed = true; - MBCalculator.setModificationInProgress(this); + boolean ownsModification = !MBCalculator.isModificationInProgress(); + if (ownsModification) { + MBCalculator.setModificationInProgress(this); + } try { boolean posted = false; @@ -192,7 +178,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { r.updateStatus(null); } } finally { - MBCalculator.setModificationInProgress(null); + if (ownsModification) { + MBCalculator.setModificationInProgress(null); + } } } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java index 6a2b33c80..36a5db693 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java @@ -25,31 +25,25 @@ import net.minecraft.world.World; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; -import appeng.api.util.WorldCoord; import appeng.core.Api; -import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; import appeng.tile.qnb.QuantumBridgeTileEntity; -public class QuantumCalculator extends MBCalculator { +public class QuantumCalculator extends MBCalculator { - private final QuantumBridgeTileEntity tqb; - - public QuantumCalculator(final IAEMultiBlock t) { + public QuantumCalculator(final QuantumBridgeTileEntity t) { super(t); - this.tqb = (QuantumBridgeTileEntity) t; } @Override - public boolean checkMultiblockScale(final WorldCoord min, final WorldCoord max) { + public boolean checkMultiblockScale(final BlockPos min, final BlockPos max) { + if ((max.getX() - min.getX() + 1) * (max.getY() - min.getY() + 1) * (max.getZ() - min.getZ() + 1) == 9) { + final int ones = ((max.getX() - min.getX()) == 0 ? 1 : 0) + ((max.getY() - min.getY()) == 0 ? 1 : 0) + + ((max.getZ() - min.getZ()) == 0 ? 1 : 0); - if ((max.x - min.x + 1) * (max.y - min.y + 1) * (max.z - min.z + 1) == 9) { - final int ones = ((max.x - min.x) == 0 ? 1 : 0) + ((max.y - min.y) == 0 ? 1 : 0) - + ((max.z - min.z) == 0 ? 1 : 0); - - final int threes = ((max.x - min.x) == 2 ? 1 : 0) + ((max.y - min.y) == 2 ? 1 : 0) - + ((max.z - min.z) == 2 ? 1 : 0); + final int threes = ((max.getX() - min.getX()) == 2 ? 1 : 0) + ((max.getY() - min.getY()) == 2 ? 1 : 0) + + ((max.getZ() - min.getZ()) == 2 ? 1 : 0); return ones == 1 && threes == 2; } @@ -57,36 +51,31 @@ public class QuantumCalculator extends MBCalculator { } @Override - public IAECluster createCluster(final World w, final WorldCoord min, final WorldCoord max) { + public QuantumCluster createCluster(final World w, final BlockPos min, final BlockPos max) { return new QuantumCluster(min, max); } @Override - public boolean verifyInternalStructure(final World w, final WorldCoord min, final WorldCoord max) { + public boolean verifyInternalStructure(final World w, final BlockPos min, final BlockPos max) { byte num = 0; - for (int x = min.x; x <= max.x; x++) { - for (int y = min.y; y <= max.y; y++) { - for (int z = min.z; z <= max.z; z++) { - final BlockPos p = new BlockPos(x, y, z); - final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(p); + for (BlockPos p : BlockPos.getAllInBoxMutable(min, max)) { + final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(p); - if (!te.isValid()) { - return false; - } + if (te == null || !te.isValid()) { + return false; + } - num++; - final IBlocks blocks = Api.instance().definitions().blocks(); - if (num == 5) { - if (!this.isBlockAtLocation(w, p, blocks.quantumLink())) { - return false; - } - } else { - if (!this.isBlockAtLocation(w, p, blocks.quantumRing())) { - return false; - } - } + num++; + final IBlocks blocks = Api.instance().definitions().blocks(); + if (num == 5) { + if (!this.isBlockAtLocation(w, p, blocks.quantumLink())) { + return false; + } + } else { + if (!this.isBlockAtLocation(w, p, blocks.quantumRing())) { + return false; } } } @@ -94,39 +83,29 @@ public class QuantumCalculator extends MBCalculator { } @Override - public void disconnect() { - this.tqb.disconnect(true); - } - - @Override - public void updateTiles(final IAECluster cl, final World w, final WorldCoord min, final WorldCoord max) { + public void updateTiles(final QuantumCluster c, final World w, final BlockPos min, final BlockPos max) { byte num = 0; byte ringNum = 0; - final QuantumCluster c = (QuantumCluster) cl; - for (int x = min.x; x <= max.x; x++) { - for (int y = min.y; y <= max.y; y++) { - for (int z = min.z; z <= max.z; z++) { - final QuantumBridgeTileEntity te = (QuantumBridgeTileEntity) w.getTileEntity(new BlockPos(x, y, z)); + for (BlockPos p : BlockPos.getAllInBoxMutable(min, max)) { + final QuantumBridgeTileEntity te = (QuantumBridgeTileEntity) w.getTileEntity(p); - num++; - final byte flags; - if (num == 5) { - flags = num; - c.setCenter(te); - } else { - if (num == 1 || num == 3 || num == 7 || num == 9) { - flags = (byte) (this.tqb.getCorner() | num); - } else { - flags = num; - } - c.getRing()[ringNum] = te; - ringNum++; - } - - te.updateStatus(c, flags, true); + num++; + final byte flags; + if (num == 5) { + flags = num; + c.setCenter(te); + } else { + if (num == 1 || num == 3 || num == 7 || num == 9) { + flags = (byte) (this.target.getCorner() | num); + } else { + flags = num; } + c.getRing()[ringNum] = te; + ringNum++; } + + te.updateStatus(c, flags, true); } } diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 7de19f5e6..6b4f5ea9d 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -36,7 +36,6 @@ import appeng.api.features.ILocatable; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; -import appeng.api.util.WorldCoord; import appeng.core.AELog; import appeng.core.Api; import appeng.me.cache.helpers.ConnectionWrapper; @@ -58,9 +57,9 @@ public class QuantumCluster implements ILocatable, IAECluster { private long otherSide; private QuantumBridgeTileEntity center; - public QuantumCluster(final WorldCoord min, final WorldCoord max) { - this.boundsMin = min.getBlockPos(); - this.boundsMax = max.getBlockPos(); + public QuantumCluster(final BlockPos min, final BlockPos max) { + this.boundsMin = min.toImmutable(); + this.boundsMax = max.toImmutable(); this.setRing(new QuantumBridgeTileEntity[8]); } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java index 43c3cce90..cff7b905e 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java @@ -22,45 +22,36 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import appeng.api.util.WorldCoord; -import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.MBCalculator; import appeng.tile.spatial.SpatialPylonTileEntity; -public class SpatialPylonCalculator extends MBCalculator { +public class SpatialPylonCalculator extends MBCalculator { - private final SpatialPylonTileEntity tqb; - - public SpatialPylonCalculator(final IAEMultiBlock t) { + public SpatialPylonCalculator(final SpatialPylonTileEntity t) { super(t); - this.tqb = (SpatialPylonTileEntity) t; } @Override - public boolean checkMultiblockScale(final WorldCoord min, final WorldCoord max) { - return (min.x == max.x && min.y == max.y && min.z != max.z) - || (min.x == max.x && min.y != max.y && min.z == max.z) - || (min.x != max.x && min.y == max.y && min.z == max.z); + public boolean checkMultiblockScale(final BlockPos min, final BlockPos max) { + return (min.getX() == max.getX() && min.getY() == max.getY() && min.getZ() != max.getZ()) + || (min.getX() == max.getX() && min.getY() != max.getY() && min.getZ() == max.getZ()) + || (min.getX() != max.getX() && min.getY() == max.getY() && min.getZ() == max.getZ()); } @Override - public IAECluster createCluster(final World w, final WorldCoord min, final WorldCoord max) { - return new SpatialPylonCluster(w, min.getBlockPos(), max.getBlockPos()); + public SpatialPylonCluster createCluster(final World w, final BlockPos min, final BlockPos max) { + return new SpatialPylonCluster(w, min, max); } @Override - public boolean verifyInternalStructure(final World w, final WorldCoord min, final WorldCoord max) { + public boolean verifyInternalStructure(final World w, final BlockPos min, final BlockPos max) { - for (int x = min.x; x <= max.x; x++) { - for (int y = min.y; y <= max.y; y++) { - for (int z = min.z; z <= max.z; z++) { - final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(new BlockPos(x, y, z)); + for (BlockPos p : BlockPos.getAllInBoxMutable(min, max)) { + final IAEMultiBlock te = (IAEMultiBlock) w.getTileEntity(p); - if (!te.isValid()) { - return false; - } - } + if (te == null || !te.isValid()) { + return false; } } @@ -68,22 +59,11 @@ public class SpatialPylonCalculator extends MBCalculator { } @Override - public void disconnect() { - this.tqb.disconnect(true); - } - - @Override - public void updateTiles(final IAECluster cl, final World w, final WorldCoord min, final WorldCoord max) { - final SpatialPylonCluster c = (SpatialPylonCluster) cl; - - for (int x = min.x; x <= max.x; x++) { - for (int y = min.y; y <= max.y; y++) { - for (int z = min.z; z <= max.z; z++) { - final SpatialPylonTileEntity te = (SpatialPylonTileEntity) w.getTileEntity(new BlockPos(x, y, z)); - te.updateStatus(c); - c.getLine().add((te)); - } - } + public void updateTiles(final SpatialPylonCluster c, final World w, final BlockPos min, final BlockPos max) { + for (BlockPos p : BlockPos.getAllInBoxMutable(min, max)) { + final SpatialPylonTileEntity te = (SpatialPylonTileEntity) w.getTileEntity(p); + te.updateStatus(c); + c.getLine().add(te); } } diff --git a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java index af79e04f3..b9d3685ec 100644 --- a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -18,11 +18,7 @@ package appeng.tile.crafting; -import java.util.Collections; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Optional; +import java.util.*; import javax.annotation.Nonnull; @@ -35,7 +31,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.common.util.Constants; import appeng.api.config.Actionable; import appeng.api.implementations.IPowerChannelState; @@ -52,7 +47,6 @@ import appeng.api.util.WorldCoord; import appeng.block.crafting.AbstractCraftingUnitBlock; import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; import appeng.core.Api; -import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.CraftingCPUCalculator; import appeng.me.cluster.implementations.CraftingCPUCluster; @@ -61,7 +55,8 @@ import appeng.me.helpers.AENetworkProxyMultiblock; import appeng.tile.grid.AENetworkTileEntity; import appeng.util.Platform; -public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiBlock, IPowerChannelState { +public class CraftingTileEntity extends AENetworkTileEntity + implements IAEMultiBlock, IPowerChannelState { private final CraftingCPUCalculator calc = new CraftingCPUCalculator(this); private CompoundNBT previousState = null; @@ -112,7 +107,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB return false; } - final AbstractCraftingUnitBlock unit = (AbstractCraftingUnitBlock) this.world.getBlockState(this.pos) + final AbstractCraftingUnitBlock unit = (AbstractCraftingUnitBlock) this.world.getBlockState(this.pos) .getBlock(); return unit.type == CraftingUnitType.ACCELERATOR; } @@ -121,11 +116,11 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB public void onReady() { super.onReady(); this.getProxy().setVisualRepresentation(this.getItemFromTile(this)); - this.calc.calculateMultiblock(world, getLocation()); + this.calc.calculateMultiblock(world, pos); } public void updateMultiBlock(BlockPos changedPos) { - this.calc.updateMultiblockAfterNeighborUpdate(this.world, this.getLocation(), changedPos); + this.calc.updateMultiblockAfterNeighborUpdate(this.world, pos, changedPos); } public void updateStatus(final CraftingCPUCluster c) { @@ -160,7 +155,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB // Not using flag 2 here (only send to clients, prevent block update) will cause // infinite loops // In case there is an inconsistency in the crafting clusters. - this.world.setBlockState(this.pos, newState, Constants.BlockFlags.BLOCK_UPDATE); + this.world.setBlockState(this.pos, newState, 2); } } @@ -214,7 +209,7 @@ public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiB } @Override - public IAECluster getCluster() { + public CraftingCPUCluster getCluster() { return this.cluster; } diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java index 84d357600..6cbeed3db 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java @@ -49,7 +49,6 @@ import appeng.api.util.DimensionalCoord; import appeng.block.qnb.QnbFormedState; import appeng.core.Api; import appeng.me.GridAccessException; -import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; import appeng.me.cluster.implementations.QuantumCalculator; import appeng.me.cluster.implementations.QuantumCluster; @@ -57,7 +56,8 @@ import appeng.tile.grid.AENetworkInvTileEntity; import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.inv.InvOperation; -public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements IAEMultiBlock, ITickableTileEntity { +public class QuantumBridgeTileEntity extends AENetworkInvTileEntity + implements IAEMultiBlock, ITickableTileEntity { public static final ModelProperty FORMED_STATE = new ModelProperty<>(); @@ -191,7 +191,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } @Override - public IAECluster getCluster() { + public QuantumCluster getCluster() { return this.cluster; } @@ -210,11 +210,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } if (this.isCorner() || this.isCenter()) { - final EnumSet sides = EnumSet.noneOf(Direction.class); - for (final Direction dir : this.getAdjacentQuantumBridges()) { - sides.add(dir); - } - + EnumSet sides = EnumSet.copyOf(this.getAdjacentQuantumBridges()); this.getProxy().setValidSides(sides); } else { this.getProxy().setValidSides(EnumSet.allOf(Direction.class)); @@ -274,7 +270,7 @@ public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements I } public void neighborUpdate(BlockPos fromPos) { - this.calc.updateMultiblockAfterNeighborUpdate(this.world, this.getLocation(), fromPos); + this.calc.updateMultiblockAfterNeighborUpdate(this.world, this.pos, fromPos); } @Override diff --git a/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java index 8324652f6..c59105469 100644 --- a/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java @@ -43,7 +43,7 @@ import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxyMultiblock; import appeng.tile.grid.AENetworkTileEntity; -public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMultiBlock { +public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMultiBlock { public static final ModelProperty STATE = new ModelProperty<>(value -> { // The lower 6 bits are used @@ -88,7 +88,7 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu @Override public void onReady() { super.onReady(); - this.calc.calculateMultiblock(world, getLocation()); + this.calc.calculateMultiblock(world, pos); } @Override @@ -98,7 +98,7 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu } public void neighborChanged(BlockPos changedPos) { - this.calc.updateMultiblockAfterNeighborUpdate(this.world, this.getLocation(), changedPos); + this.calc.updateMultiblockAfterNeighborUpdate(this.world, pos, changedPos); } @Override @@ -131,9 +131,9 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu this.displayBits = 0; if (this.cluster != null) { - if (this.cluster.getBoundsMin().equals(this.getLocation())) { + if (this.cluster.getBoundsMin().equals(this.pos)) { this.displayBits = DISPLAY_END_MIN; - } else if (this.cluster.getBoundsMax().equals(this.getLocation())) { + } else if (this.cluster.getBoundsMax().equals(this.pos)) { this.displayBits = DISPLAY_END_MAX; } else { this.displayBits = DISPLAY_MIDDLE; From 755ac12b8a3339a49628caddb739a29f7438287b Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 19 Jul 2020 11:43:20 +0200 Subject: [PATCH 02/19] Fix SortedSet using compare for equals (#4479) Fix SortedSet using compare for equals --- .../appeng/api/networking/energy/IAEPowerStorage.java | 5 +++++ src/main/java/appeng/me/cache/EnergyGridCache.java | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java index e571e3c4e..8917516bf 100644 --- a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java +++ b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java @@ -27,6 +27,7 @@ import javax.annotation.Nonnull; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; +import appeng.api.networking.IGrid; /** * Used to access information about AE's various power accepting blocks for @@ -78,6 +79,10 @@ public interface IAEPowerStorage extends IEnergySource { * A higher value means it is more likely to be extracted from first, and less * likely to be inserted into first. * + * The value needs to be constant once added to a {@link IGrid}. Should it ever + * need to be changed, it has to be removed from the grid, then update the + * value, and finally added back to the grid. + * * This should never use {@link Integer#MIN_VALUE} or {@link Integer#MAX_VALUE}. * * @return the priority for this storage diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index abc983454..db92ac10a 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -74,10 +74,13 @@ public class EnergyGridCache implements IEnergyGrid { return Double.compare(percent1, percent2); }; - private static final Comparator COMPARATOR_HIGHEST_PRIORITY_FIRST = (o1, o2) -> Integer - .compare(o2.getPriority(), o1.getPriority()); - private static final Comparator COMPARATOR_LOWEST_PRIORITY_FIRST = (o1, o2) -> Integer - .compare(o1.getPriority(), o2.getPriority()); + private static final Comparator COMPARATOR_HIGHEST_PRIORITY_FIRST = (o1, o2) -> { + final int cmp = Integer.compare(o2.getPriority(), o1.getPriority()); + return cmp != 0 ? cmp : Integer.compare(System.identityHashCode(o2), System.identityHashCode(o1)); + }; + + private static final Comparator COMPARATOR_LOWEST_PRIORITY_FIRST = (o1, + o2) -> -COMPARATOR_HIGHEST_PRIORITY_FIRST.compare(o1, o2); private final NavigableSet interests = Sets.newTreeSet(); private final double averageLength = 40.0; From 0367b35ce0dc55ebbf233eb8eb77c705657ccbbf Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 12:04:15 +0200 Subject: [PATCH 03/19] Never return null from Widget#getMessage since the narrator will always dereference it, leading to a crash. --- .../java/appeng/client/gui/widgets/SettingToggleButton.java | 2 +- src/main/java/appeng/client/gui/widgets/ToggleButton.java | 2 +- .../java/appeng/fluids/client/gui/widgets/FluidTankWidget.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index 50ddad377..e5a532cd4 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -314,7 +314,7 @@ public class SettingToggleButton> extends IconButton { return name + '\n' + sb; } - return null; + return ""; } public String getFillVar() { diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/main/java/appeng/client/gui/widgets/ToggleButton.java index 8d2f63560..5a13843b5 100644 --- a/src/main/java/appeng/client/gui/widgets/ToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/ToggleButton.java @@ -99,7 +99,7 @@ public class ToggleButton extends Button implements ITooltip { return name + '\n' + sb; } - return null; + return ""; } @Override diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java index 80a97b4d1..3fc8a098d 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java @@ -93,7 +93,7 @@ public class FluidTankWidget extends Widget implements ITooltip { return desc + "\n" + amountToText; } - return null; + return ""; } @Override From bdd22093c39f3f3522e5cd12f58050c74e294a4e Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 12:05:26 +0200 Subject: [PATCH 04/19] Account for empty messages when drawing tooltips. --- src/main/java/appeng/client/gui/AEBaseScreen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index 772609354..c8c0b32a3 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -176,7 +176,7 @@ public abstract class AEBaseScreen extends ContainerS } final String msg = tooltip.getMessage(); - if (msg != null) { + if (msg != null && !msg.isEmpty()) { this.drawTooltip(x + 11, y + 4, msg); } } From 223163aa0a7dbb1a4de59b31462d50b3ef42cd2b Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 19 Jul 2020 13:13:20 +0200 Subject: [PATCH 05/19] Fixes #4330: Avoid mutating the input stack (#4481) --- src/main/java/appeng/util/Platform.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 12bfd17cd..5e9d5fadf 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -839,17 +839,19 @@ public class Platform { energy.extractAEPower(stored / energyFactor, Actionable.MODULATE, PowerMultiplier.CONFIG); if (itemToAdd < input.getStackSize()) { final long original = input.getStackSize(); + final T leftover = input.copy(); final T split = input.copy(); - split.decStackSize(itemToAdd); - input.setStackSize(itemToAdd); - split.add(cell.injectItems(input, Actionable.MODULATE, src)); + + leftover.decStackSize(itemToAdd); + split.setStackSize(itemToAdd); + leftover.add(cell.injectItems(split, Actionable.MODULATE, src)); src.player().ifPresent(player -> { - final long diff = original - split.getStackSize(); + final long diff = original - leftover.getStackSize(); AeStats.ItemsInserted.addToPlayer(player, (int) diff); }); - return split; + return leftover; } final T ret = cell.injectItems(input, Actionable.MODULATE, src); From 71a91e51fb18326c57af13ee05bcf1687f5f629e Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 13:16:50 +0200 Subject: [PATCH 06/19] Naming improvements --- src/main/java/appeng/util/Platform.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 5e9d5fadf..c309afff9 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -822,21 +822,21 @@ public class Platform { Preconditions.checkNotNull(src); Preconditions.checkNotNull(mode); - final T possible = cell.injectItems(input.copy(), Actionable.SIMULATE, src); + final T overflow = cell.injectItems(input.copy(), Actionable.SIMULATE, src); - long stored = input.getStackSize(); - if (possible != null) { - stored -= possible.getStackSize(); + long transferAmount = input.getStackSize(); + if (overflow != null) { + transferAmount -= overflow.getStackSize(); } final double energyFactor = Math.max(1.0, cell.getChannel().transferFactor()); - final double availablePower = energy.extractAEPower(stored / energyFactor, Actionable.SIMULATE, + final double availablePower = energy.extractAEPower(transferAmount / energyFactor, Actionable.SIMULATE, PowerMultiplier.CONFIG); - final long itemToAdd = Math.min((long) ((availablePower * energyFactor) + 0.9), stored); + final long itemToAdd = Math.min((long) ((availablePower * energyFactor) + 0.9), transferAmount); if (itemToAdd > 0) { if (mode == Actionable.MODULATE) { - energy.extractAEPower(stored / energyFactor, Actionable.MODULATE, PowerMultiplier.CONFIG); + energy.extractAEPower(transferAmount / energyFactor, Actionable.MODULATE, PowerMultiplier.CONFIG); if (itemToAdd < input.getStackSize()) { final long original = input.getStackSize(); final T leftover = input.copy(); From de7cbc49492e21c7a1290b31b7108aa9ec7ef149 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 13:37:23 +0200 Subject: [PATCH 07/19] Moved part-related textures from textures/item/part to textures/parts/ and adapted the level emitter item models to use the normal part texture. --- .../models/item/annihilation_plane.json | 2 +- .../models/item/cable_fluid_interface.json | 2 +- .../models/item/cable_interface.json | 2 +- .../models/item/conversion_monitor.json | 2 +- .../models/item/crafting_terminal.json | 2 +- .../models/item/export_bus.json | 2 +- .../models/item/fluid_annihilation_plane.json | 2 +- .../models/item/fluid_export_bus.json | 2 +- .../models/item/fluid_formation_plane.json | 2 +- .../models/item/fluid_import_bus.json | 2 +- .../models/item/fluid_level_emitter.json | 32 ++++-------------- .../models/item/fluid_storage_bus.json | 2 +- .../models/item/fluid_terminal.json | 2 +- .../models/item/formation_plane.json | 2 +- .../item/identity_annihilation_plane.json | 2 +- .../models/item/import_bus.json | 2 +- .../models/item/interface_terminal.json | 2 +- .../models/item/inverted_toggle_bus.json | 2 +- .../models/item/level_emitter.json | 32 ++++-------------- .../models/item/monitor.json | 2 +- .../models/item/p2p_tunnel_base.json | 4 +-- .../models/item/pattern_terminal.json | 2 +- .../models/item/quartz_fiber.json | 2 +- .../models/item/storage_bus.json | 2 +- .../models/item/storage_monitor.json | 2 +- .../models/item/terminal.json | 2 +- .../models/item/toggle_bus.json | 2 +- .../models/part/annihilation_plane.json | 2 +- .../models/part/export_bus_base.json | 2 +- .../models/part/fluid_annihilation_plane.json | 2 +- .../models/part/fluid_export_bus_base.json | 2 +- .../models/part/fluid_formation_plane.json | 2 +- .../models/part/fluid_import_bus_base.json | 2 +- .../models/part/fluid_interface_base.json | 2 +- .../models/part/fluid_storage_bus_base.json | 2 +- .../models/part/formation_plane.json | 2 +- .../part/identity_annihilation_plane.json | 2 +- .../models/part/import_bus_base.json | 2 +- .../models/part/interface_base.json | 2 +- .../models/part/inverted_toggle_bus_base.json | 2 +- .../models/part/p2p/p2p_tunnel_base.json | 8 ++--- .../models/part/quartz_fiber.json | 4 +-- .../models/part/storage_bus_base.json | 2 +- .../models/part/toggle_bus_base.json | 4 +-- .../textures/item/part/level_emitter_off.png | Bin 236 -> 0 bytes .../part => parts}/annihilation_plane.png | Bin .../part => parts}/conversion_monitor.png | Bin .../part => parts}/crafting_terminal.png | Bin .../{item/part => parts}/export_bus.png | Bin .../fluid_annihilation_plane.png | Bin .../{item/part => parts}/fluid_export_bus.png | Bin .../part => parts}/fluid_formation_plane.png | Bin .../{item/part => parts}/fluid_import_bus.png | Bin .../{item/part => parts}/fluid_interface.png | Bin .../part => parts}/fluid_storage_bus.png | Bin .../{item/part => parts}/fluid_terminal.png | Bin .../{item/part => parts}/formation_plane.png | Bin .../identity_annihilation_plane.png | Bin .../{item/part => parts}/import_bus.png | Bin .../{item/part => parts}/interface.png | Bin .../part => parts}/interface_terminal.png | Bin .../part => parts}/inverted_toggle_bus.png | Bin .../{item/part => parts}/p2p_tunnel_back.png | Bin .../{item/part => parts}/p2p_tunnel_back2.png | Bin .../{item/part => parts}/p2p_tunnel_front.png | Bin .../{item/part => parts}/pattern_terminal.png | Bin .../{item/part => parts}/quartz_fiber.png | Bin .../{item/part => parts}/storage_bus.png | Bin .../{item/part => parts}/storage_monitor.png | Bin .../{item/part => parts}/terminal.png | Bin .../{item/part => parts}/toggle_bus.png | Bin 71 files changed, 62 insertions(+), 98 deletions(-) delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/annihilation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/conversion_monitor.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/crafting_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/export_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_annihilation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_export_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_formation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_import_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_interface.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_storage_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/fluid_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/formation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/identity_annihilation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/import_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/interface.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/interface_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/inverted_toggle_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/p2p_tunnel_back.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/p2p_tunnel_back2.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/p2p_tunnel_front.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/pattern_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/quartz_fiber.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/storage_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/storage_monitor.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{item/part => parts}/toggle_bus.png (100%) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json index 5328a76e8..bbd62a31b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json @@ -2,7 +2,7 @@ "parent": "appliedenergistics2:item/part_base", "textures": { "sides": "appliedenergistics2:parts/plane_sides", - "plane": "appliedenergistics2:item/part/annihilation_plane" + "plane": "appliedenergistics2:parts/annihilation_plane" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json index 9ea191f84..255ee8002 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/monitor_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/fluid_interface" + "front": "appliedenergistics2:parts/fluid_interface" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json index 00ed9ec0f..f2fde2052 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/monitor_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/interface" + "front": "appliedenergistics2:parts/interface" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json index 47353aadb..ebe38591d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/conversion_monitor", + "front": "appliedenergistics2:parts/conversion_monitor", "front_bright": "appliedenergistics2:parts/conversion_monitor_bright", "front_medium": "appliedenergistics2:parts/conversion_monitor_medium", "front_dark": "appliedenergistics2:parts/conversion_monitor_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json index 3ff073c31..2b4f59ac0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/crafting_terminal", + "front": "appliedenergistics2:parts/crafting_terminal", "front_bright": "appliedenergistics2:parts/crafting_terminal_bright", "front_medium": "appliedenergistics2:parts/crafting_terminal_medium", "front_dark": "appliedenergistics2:parts/crafting_terminal_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json index da2176f8a..cab7d7419 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/export_bus_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/export_bus" + "front": "appliedenergistics2:parts/export_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json index 382b9727a..59d4a9cd6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json @@ -2,7 +2,7 @@ "parent": "appliedenergistics2:item/part_base", "textures": { "sides": "appliedenergistics2:parts/plane_sides", - "plane": "appliedenergistics2:item/part/fluid_annihilation_plane" + "plane": "appliedenergistics2:parts/fluid_annihilation_plane" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json index ff0d293be..231fc2d98 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/export_bus_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/fluid_export_bus" + "front": "appliedenergistics2:parts/fluid_export_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json index 8dc7a2b68..6533d4ec3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/annihilation_plane", "textures": { - "plane": "appliedenergistics2:item/part/fluid_formation_plane" + "plane": "appliedenergistics2:parts/fluid_formation_plane" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json index a38eeb6cf..559832e60 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/import_bus_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/fluid_import_bus" + "front": "appliedenergistics2:parts/fluid_import_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json index 5582ee69a..1c8e662bc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json @@ -1,37 +1,19 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "emitter": "appliedenergistics2:item/part/level_emitter_off" + "emitter": "appliedenergistics2:parts/level_emitter_off" }, "elements": [ { "from": [7, 6, 7], "to": [9, 10, 9], "faces": { - "north": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "south": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "east": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "west": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "up": { - "texture": "#emitter", - "uv": [7, 7, 9, 9] - }, - "down": { - "texture": "#emitter", - "uv": [7, 9, 9, 11] - } + "north": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "east": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "south": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "west": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "up": { "uv": [6, 7, 8, 9], "texture": "#emitter" }, + "down": { "uv": [8, 7, 10, 9], "texture": "#emitter" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json index 15fb4dd4b..41a28a51c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/storage_bus_sides", "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:item/part/fluid_storage_bus" + "front": "appliedenergistics2:parts/fluid_storage_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json index c07799c13..0b501b578 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/crafting_terminal", + "front": "appliedenergistics2:parts/crafting_terminal", "front_bright": "appliedenergistics2:parts/fluid_terminal/lights_bright", "front_medium": "appliedenergistics2:parts/fluid_terminal/lights_medium", "front_dark": "appliedenergistics2:parts/fluid_terminal/lights_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json index 7a8d1c57e..a92535a77 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/annihilation_plane", "textures": { - "plane": "appliedenergistics2:item/part/formation_plane" + "plane": "appliedenergistics2:parts/formation_plane" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json index 03f4e0f18..a2880b51e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/annihilation_plane", "textures": { - "plane": "appliedenergistics2:item/part/identity_annihilation_plane" + "plane": "appliedenergistics2:parts/identity_annihilation_plane" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json index d37623ec4..889aaafce 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/import_bus_sides", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/import_bus" + "front": "appliedenergistics2:parts/import_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json index 2dbf34fac..2e85ef625 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/interface_terminal", + "front": "appliedenergistics2:parts/interface_terminal", "front_bright": "appliedenergistics2:parts/interface_terminal_bright", "front_medium": "appliedenergistics2:parts/interface_terminal_medium", "front_dark": "appliedenergistics2:parts/interface_terminal_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json index aa967485a..5be0fb7d6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/toggle_bus", "textures": { - "bus": "appliedenergistics2:item/part/inverted_toggle_bus" + "bus": "appliedenergistics2:parts/inverted_toggle_bus" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json index 5582ee69a..1c8e662bc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json @@ -1,37 +1,19 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "emitter": "appliedenergistics2:item/part/level_emitter_off" + "emitter": "appliedenergistics2:parts/level_emitter_off" }, "elements": [ { "from": [7, 6, 7], "to": [9, 10, 9], "faces": { - "north": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "south": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "east": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "west": { - "texture": "#emitter", - "uv": [7, 7, 9, 11] - }, - "up": { - "texture": "#emitter", - "uv": [7, 7, 9, 9] - }, - "down": { - "texture": "#emitter", - "uv": [7, 9, 9, 11] - } + "north": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "east": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "south": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "west": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, + "up": { "uv": [6, 7, 8, 9], "texture": "#emitter" }, + "down": { "uv": [8, 7, 10, 9], "texture": "#emitter" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/models/item/monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/monitor.json index a5ce7c9d8..43d32bf05 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/monitor.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/crafting_terminal", + "front": "appliedenergistics2:parts/crafting_terminal", "front_bright": "appliedenergistics2:parts/monitor_bright", "front_medium": "appliedenergistics2:parts/monitor_colored", "front_dark": "appliedenergistics2:parts/monitor_colored" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json b/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json index 3d7b5e630..43f236cb6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json @@ -2,8 +2,8 @@ "parent": "appliedenergistics2:item/part_base", "textures": { "sides": "appliedenergistics2:parts/p2p_tunnel_sides", - "back": "appliedenergistics2:item/part/p2p_tunnel_back", - "front": "appliedenergistics2:item/part/p2p_tunnel_front", + "back": "appliedenergistics2:parts/p2p_tunnel_back", + "front": "appliedenergistics2:parts/p2p_tunnel_front", "type": "appliedenergistics2:block/quartz_block" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json index befadb8e2..98cef6642 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/pattern_terminal", + "front": "appliedenergistics2:parts/pattern_terminal", "front_bright": "appliedenergistics2:parts/pattern_terminal_bright", "front_medium": "appliedenergistics2:parts/pattern_terminal_medium", "front_dark": "appliedenergistics2:parts/pattern_terminal_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json index efd30161a..9623e2590 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "cable": "appliedenergistics2:item/part/quartz_fiber" + "cable": "appliedenergistics2:parts/quartz_fiber" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json index 006c3d771..88471b603 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json @@ -3,7 +3,7 @@ "textures": { "sides": "appliedenergistics2:parts/storage_bus_sides", "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:item/part/storage_bus" + "front": "appliedenergistics2:parts/storage_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json index aa701b0c3..74b2b7174 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/storage_monitor", + "front": "appliedenergistics2:parts/storage_monitor", "front_bright": "appliedenergistics2:parts/storage_monitor_bright", "front_medium": "appliedenergistics2:parts/storage_monitor_medium", "front_dark": "appliedenergistics2:parts/storage_monitor_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/terminal.json index 1734597fe..66d824b33 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/terminal.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:item/part/terminal", + "front": "appliedenergistics2:parts/terminal", "front_bright": "appliedenergistics2:parts/terminal_bright", "front_medium": "appliedenergistics2:parts/terminal_medium", "front_dark": "appliedenergistics2:parts/terminal_dark" diff --git a/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json index b2cd4c2fc..457b6c8d5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "bus": "appliedenergistics2:item/part/toggle_bus", + "bus": "appliedenergistics2:parts/toggle_bus", "status": "appliedenergistics2:parts/monitor_sides_status", "lights": "appliedenergistics2:parts/monitor_sides_status_off" }, diff --git a/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json index 088ba1d22..617758979 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:item/part/annihilation_plane", + "front": "appliedenergistics2:parts/annihilation_plane", "sides": "appliedenergistics2:parts/plane_sides", "back": "appliedenergistics2:parts/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json index 8bfcab093..f82d6f026 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/export_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/export_bus", + "front": "appliedenergistics2:parts/export_bus", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json index 0e3bfde89..7ea7bbe1c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:item/part/fluid_annihilation_plane", + "front": "appliedenergistics2:parts/fluid_annihilation_plane", "sides": "appliedenergistics2:parts/plane_sides", "back": "appliedenergistics2:parts/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json index 72f31828b..7a62df859 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/export_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/fluid_export_bus", + "front": "appliedenergistics2:parts/fluid_export_bus", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json index 75b1ff4a3..1adaf10ed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:item/part/fluid_formation_plane", + "front": "appliedenergistics2:parts/fluid_formation_plane", "sides": "appliedenergistics2:parts/plane_sides", "back": "appliedenergistics2:parts/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json index d268ecb5d..114a8f894 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/import_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/fluid_import_bus", + "front": "appliedenergistics2:parts/fluid_import_bus", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json index 1355e83b1..93337bfdc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/export_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/fluid_interface", + "front": "appliedenergistics2:parts/fluid_interface", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json index 273f4226f..aac09562e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/storage_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:item/part/fluid_storage_bus", + "front": "appliedenergistics2:parts/fluid_storage_bus", "particle": "appliedenergistics2:parts/storage_bus_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json index a58c99bad..0b8e7e02d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:item/part/formation_plane", + "front": "appliedenergistics2:parts/formation_plane", "sides": "appliedenergistics2:parts/plane_sides", "back": "appliedenergistics2:parts/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json index 5695c1a26..e3560deb5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:item/part/identity_annihilation_plane", + "front": "appliedenergistics2:parts/identity_annihilation_plane", "sides": "appliedenergistics2:parts/plane_sides", "back": "appliedenergistics2:parts/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json index 4233fae26..b3f35681f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/import_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/import_bus", + "front": "appliedenergistics2:parts/import_bus", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json index 6d1d78633..7063505df 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/export_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:item/part/interface", + "front": "appliedenergistics2:parts/interface", "particle": "appliedenergistics2:parts/monitor_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json index 544964f3b..eb0c23467 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:part/toggle_bus_base", "textures": { - "bus": "appliedenergistics2:item/part/inverted_toggle_bus" + "bus": "appliedenergistics2:parts/inverted_toggle_bus" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json index e261e54c9..4c6372bcb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json @@ -1,10 +1,10 @@ { "textures": { - "front": "appliedenergistics2:item/part/p2p_tunnel_front", + "front": "appliedenergistics2:parts/p2p_tunnel_front", "sides": "appliedenergistics2:parts/p2p_tunnel_sides", - "back": "appliedenergistics2:item/part/p2p_tunnel_back", - "particle": "appliedenergistics2:item/part/p2p_tunnel_back", - "back2": "appliedenergistics2:item/part/p2p_tunnel_back2" + "back": "appliedenergistics2:parts/p2p_tunnel_back", + "particle": "appliedenergistics2:parts/p2p_tunnel_back", + "back2": "appliedenergistics2:parts/p2p_tunnel_back2" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json b/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json index 9c6f53c12..952d200ed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json @@ -1,7 +1,7 @@ { "textures": { - "fiber": "appliedenergistics2:item/part/quartz_fiber", - "particle": "appliedenergistics2:item/part/quartz_fiber" + "fiber": "appliedenergistics2:parts/quartz_fiber", + "particle": "appliedenergistics2:parts/quartz_fiber" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json index e9b909551..d07100af0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json @@ -3,7 +3,7 @@ "sides": "appliedenergistics2:parts/storage_bus_sides", "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:item/part/storage_bus", + "front": "appliedenergistics2:parts/storage_bus", "particle": "appliedenergistics2:parts/storage_bus_back" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json index 4d6be7780..92d8a0f61 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json @@ -1,8 +1,8 @@ { "textures": { - "bus": "appliedenergistics2:item/part/toggle_bus", + "bus": "appliedenergistics2:parts/toggle_bus", "sides": "appliedenergistics2:parts/monitor_sides_status", - "particle": "appliedenergistics2:item/part/toggle_bus" + "particle": "appliedenergistics2:parts/toggle_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png deleted file mode 100644 index cb07b34deaaaad8504948b0aa8555134d9aeb4ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#M6k zT^vI!{F5bE56iU}8vOarkfbragyGT}&rU||ur)vKU%23~kMZ{QeD(Vc|NsAAoG^)D jSK2RW2loR97#N-jTmC-mQ8$Z$fq}u()z4*}Q$iB}PF_eE diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/conversion_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/conversion_monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/crafting_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/crafting_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/export_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/export_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_export_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_export_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_export_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_formation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_import_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_import_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_import_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_interface.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_storage_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_storage_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_storage_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/formation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/identity_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/identity_annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/import_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/import_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/interface.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/interface.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/interface.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/interface_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/interface_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/inverted_toggle_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/inverted_toggle_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/inverted_toggle_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/inverted_toggle_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back2.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_front.png b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_front.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_front.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_front.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/pattern_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/pattern_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/quartz_fiber.png b/src/main/resources/assets/appliedenergistics2/textures/parts/quartz_fiber.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/quartz_fiber.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/quartz_fiber.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/storage_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/storage_monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/terminal.png b/src/main/resources/assets/appliedenergistics2/textures/parts/terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/item/part/toggle_bus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/toggle_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/item/part/toggle_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/toggle_bus.png From e023d83e6279f88c4f2d866a2cba86b5de37a30b Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 13:40:42 +0200 Subject: [PATCH 08/19] Deleted unused matrix frame related documentation images. --- .../textures/orientation/BlockMatrixFrame.png | Bin 225 -> 0 bytes .../textures/orientation/BlockMatrixFrameBack.png | Bin 205 -> 0 bytes .../orientation/BlockMatrixFrameBottom.png | Bin 212 -> 0 bytes .../textures/orientation/BlockMatrixFrameEast.png | Bin 200 -> 0 bytes .../orientation/BlockMatrixFrameFront.png | Bin 204 -> 0 bytes .../textures/orientation/BlockMatrixFrameWest.png | Bin 198 -> 0 bytes 6 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBack.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png deleted file mode 100644 index ebae8b21b4f3dddc3b6310ec4242eb1dcbdb07b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|#yzJ0@noWnf^CDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz!2-{;uvD#|8$}uUxNV;v+buOy92Aan{PKv$SC27mB?5U9rIjdrB?ggiBEjr zb@1$#sMG6sc}Vc!)_I2n9c=_u683C2ZV1^T_C&lXWKZPmXPl*ear@XU|?X7Dshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz~JfW;uvD#pZuer)xf~uPd?izh2#kmW(}bwM&L z2N`l0IS$R>+Q_0Hk<6HWZq7ji29-A69;pxi?HMFz^PO6JcO5?i$W&K9mvv4FO#pdv BJ+A-& diff --git a/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png deleted file mode 100644 index 1125cfa9af213810633d2a20bbd3027bd2607546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{Qf+Xupoubeg>U|?X7Dshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz!2c+;uvD#|MucW-UA9eE*G_p3&l=U#c3@3anMy|gC4g+*Yz2f^Do?8(8Zx= zcyjjbcMkkdnjbUu9cd13f3YEqmdKI;Vst01IwQ3IG5A diff --git a/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png deleted file mode 100644 index 7c9d0ce23c96c136b7fb6a814ca55070ca86891d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{Qf+Xupoubeg>U|?X7Dshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz~JKP;uvD#pZuer)xdzERnj8BAcBWm!jwUyb=`!JGXZQS%+hY*H+V!2wY4`h xzToma>R@beaHes(fk@NQ4Gn?J|NgTxL{590y*z#TRR#tI22WQ%mvv4FO#pPdInDq8 diff --git a/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png deleted file mode 100644 index fdcd3d6aa9cf588112ebd3e4cac6ee1569e06a28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{Qf+YiEw7OcT43=9lXC9V-A!TD(=<%vb93;~Imc_n&&t|1C##(JiDhKBB+ zoy-{+7(6^(978Pp-%d2-V^H8=w*HkAf3iDfm29itx;C}#4#mt3Y77>Yi)VUsUwLZv z+DlB}a8pdpQ}#yd1t(m~9TMw>1zi`+^yWUnyTg}LYD(zceGCi?44$rjF6*2Ung9|Z BI~D){ diff --git a/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png deleted file mode 100644 index 9c643dd80fde99d2f8c9d67b27847109916dee04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{Qf+Xupoubeg>U|?X7Dshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc}1Zsz~JQR;uvD#pZuer)xf~uPx_Dl+@j1!H#7z^J7irHozykEkuCY~3$D`*DrPn^ wJPzR=R>zpm&9Q7=D4^2D+avYizdZv_t=X#E2N{1bFfcH9y85}Sb4q9e0Q|i> Date: Sun, 19 Jul 2020 14:09:57 +0200 Subject: [PATCH 09/19] Removed unused crafting and fluid terminal models and associated textures. Unified naming for textures used by the fluid terminal. --- .../models/item/fluid_terminal.json | 6 +- .../models/part/crafting_terminal.json | 140 ------------------ .../models/part/fluid_terminal.json | 140 ------------------ .../models/part/fluid_terminal_off.json | 6 +- .../models/part/fluid_terminal_on.json | 6 +- .../textures/parts/crafting_terminal/back.png | Bin 268 -> 0 bytes .../parts/crafting_terminal/backlights.png | Bin 272 -> 0 bytes .../parts/crafting_terminal/frame.png | Bin 259 -> 0 bytes .../textures/parts/crafting_terminal/l0.png | Bin 281 -> 0 bytes .../textures/parts/crafting_terminal/l1.png | Bin 257 -> 0 bytes .../textures/parts/crafting_terminal/l2.png | Bin 256 -> 0 bytes .../parts/crafting_terminal/sides.png | Bin 229 -> 0 bytes .../parts/crafting_terminal/sidesstatus.png | Bin 261 -> 0 bytes .../textures/parts/fluid_terminal/back.png | Bin 268 -> 0 bytes .../parts/fluid_terminal/backlights.png | Bin 272 -> 0 bytes .../textures/parts/fluid_terminal/frame.png | Bin 259 -> 0 bytes .../textures/parts/fluid_terminal/sides.png | Bin 229 -> 0 bytes .../parts/fluid_terminal/sidesstatus.png | Bin 261 -> 0 bytes ...s_bright.png => fluid_terminal_bright.png} | Bin ...ights_dark.png => fluid_terminal_dark.png} | Bin ...s_medium.png => fluid_terminal_medium.png} | Bin 21 files changed, 9 insertions(+), 289 deletions(-) delete mode 100644 src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png delete mode 100644 src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png rename src/main/resources/assets/appliedenergistics2/textures/parts/{fluid_terminal/lights_bright.png => fluid_terminal_bright.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/parts/{fluid_terminal/lights_dark.png => fluid_terminal_dark.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/parts/{fluid_terminal/lights_medium.png => fluid_terminal_medium.png} (100%) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json index 0b501b578..f123a10aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json @@ -2,8 +2,8 @@ "parent": "appliedenergistics2:item/display_base", "textures": { "front": "appliedenergistics2:parts/crafting_terminal", - "front_bright": "appliedenergistics2:parts/fluid_terminal/lights_bright", - "front_medium": "appliedenergistics2:parts/fluid_terminal/lights_medium", - "front_dark": "appliedenergistics2:parts/fluid_terminal/lights_dark" + "front_bright": "appliedenergistics2:parts/fluid_terminal_bright", + "front_medium": "appliedenergistics2:parts/fluid_terminal_medium", + "front_dark": "appliedenergistics2:parts/fluid_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json deleted file mode 100644 index ce80ad08e..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "textures": { - "frame": "appliedenergistics2:parts/crafting_terminal/frame", - "sides": "appliedenergistics2:parts/crafting_terminal/sides", - "back": "appliedenergistics2:parts/crafting_terminal/back", - "l0": "appliedenergistics2:parts/crafting_terminal/l0", - "l1": "appliedenergistics2:parts/crafting_terminal/l1", - "l2": "appliedenergistics2:parts/crafting_terminal/l2", - "SidesStatus": "appliedenergistics2:parts/crafting_terminal/sidesstatus", - "Backlights": "appliedenergistics2:parts/crafting_terminal/backlights", - "particle": "appliedenergistics2:parts/crafting_terminal/back" - }, - "elements": [ - { - "name": "Base", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "frame", - "uv": [2.0, 2.0, 14.0, 14.0] - }, - "east": { - "texture": "sides", - "uv": [0.0, 2.0, 1.0, 14.0] - }, - "south": { - "texture": "back", - "uv": [2.0, 2.0, 14.0, 14.0] - }, - "west": { - "texture": "sides", - "uv": [15.0, 2.0, 16.0, 14.0] - }, - "up": { - "texture": "sides", - "uv": [2.0, 0.0, 14.0, 1.0] - }, - "down": { - "texture": "sides", - "uv": [2.0, 15.0, 14.0, 16.0] - } - } - }, - { - "name": "l0", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "l0", - "tintindex": 1, - "uv": [2.0, 2.0, 14.0, 14.0] - } - } - }, - { - "name": "l1", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "l1", - "tintindex": 2, - "uv": [2.0, 2.0, 14.0, 14.0] - } - } - }, - { - "name": "l2", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "l2", - "tintindex": 3, - "uv": [2.0, 2.0, 14.0, 14.0] - } - } - }, - { - "name": "Back", - "from": [4.0, 4.0, 1.0], - "to": [12.0, 12.0, 2.0], - "faces": { - "north": { - "texture": "back", - "uv": [4.0, 4.0, 12.0, 12.0] - }, - "east": { - "texture": "SidesStatus", - "uv": [0.0, 4.0, 1.0, 12.0] - }, - "south": { - "texture": "back", - "uv": [4.0, 4.0, 12.0, 12.0] - }, - "west": { - "texture": "SidesStatus", - "uv": [15.0, 4.0, 16.0, 12.0] - }, - "up": { - "texture": "SidesStatus", - "uv": [4.0, 0.0, 12.0, 1.0] - }, - "down": { - "texture": "SidesStatus", - "uv": [4.0, 15.0, 12.0, 16.0] - } - } - }, - { - "name": "Backlights", - "from": [4.0, 4.0, 1.0], - "to": [12.0, 12.0, 2.0], - "faces": { - "east": { - "texture": "Backlights", - "tintindex": 0, - "uv": [0.0, 4.0, 1.0, 12.0] - }, - "west": { - "texture": "Backlights", - "tintindex": 0, - "uv": [15.0, 4.0, 16.0, 12.0] - }, - "up": { - "texture": "Backlights", - "tintindex": 0, - "uv": [4.0, 0.0, 12.0, 1.0] - }, - "down": { - "texture": "Backlights", - "tintindex": 0, - "uv": [4.0, 15.0, 12.0, 16.0] - } - } - } - ] -} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json deleted file mode 100644 index 4f7e4a926..000000000 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "textures": { - "frame": "appliedenergistics2:parts/fluid_terminal/frame", - "sides": "appliedenergistics2:parts/fluid_terminal/sides", - "back": "appliedenergistics2:parts/fluid_terminal/back", - "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright", - "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium", - "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark", - "status": "appliedenergistics2:parts/fluid_terminal/status", - "backlights": "appliedenergistics2:parts/fluid_terminal/backlights", - "particle": "appliedenergistics2:parts/fluid_terminal/back" - }, - "elements": [ - { - "name": "Base", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "frame", - "uv": [2.0, 2.0, 14.0, 14.0] - }, - "east": { - "texture": "sides", - "uv": [0.0, 2.0, 1.0, 14.0] - }, - "south": { - "texture": "back", - "uv": [2.0, 2.0, 14.0, 14.0] - }, - "west": { - "texture": "sides", - "uv": [15.0, 2.0, 16.0, 14.0] - }, - "up": { - "texture": "sides", - "uv": [2.0, 0.0, 14.0, 1.0] - }, - "down": { - "texture": "sides", - "uv": [2.0, 15.0, 14.0, 16.0] - } - } - }, - { - "name": "lightsBright", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "lightsBright", - "tintindex": 1, - "uv": [2.0, 2.0, 14.0, 14.0] - } - } - }, - { - "name": "lightsDark", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "lightsDark", - "tintindex": 2, - "uv": [2.0, 2.0, 14.0, 14.0] - } - } - }, - { - "name": "lightsMedium", - "from": [2.0, 2.0, 0.0], - "to": [14.0, 14.0, 1.0], - "faces": { - "north": { - "texture": "lightsMedium", - "tintindex": 3, - "uv": [2.0, 2.0, 14.0, 14.0] - } - } - }, - { - "name": "Back", - "from": [4.0, 4.0, 1.0], - "to": [12.0, 12.0, 2.0], - "faces": { - "north": { - "texture": "back", - "uv": [4.0, 4.0, 12.0, 12.0] - }, - "east": { - "texture": "status", - "uv": [0.0, 4.0, 1.0, 12.0] - }, - "south": { - "texture": "back", - "uv": [4.0, 4.0, 12.0, 12.0] - }, - "west": { - "texture": "status", - "uv": [15.0, 4.0, 16.0, 12.0] - }, - "up": { - "texture": "status", - "uv": [4.0, 0.0, 12.0, 1.0] - }, - "down": { - "texture": "status", - "uv": [4.0, 15.0, 12.0, 16.0] - } - } - }, - { - "name": "backlights", - "from": [4.0, 4.0, 1.0], - "to": [12.0, 12.0, 2.0], - "faces": { - "east": { - "texture": "backlights", - "tintindex": 0, - "uv": [0.0, 4.0, 1.0, 12.0] - }, - "west": { - "texture": "backlights", - "tintindex": 0, - "uv": [15.0, 4.0, 16.0, 12.0] - }, - "up": { - "texture": "backlights", - "tintindex": 0, - "uv": [4.0, 0.0, 12.0, 1.0] - }, - "down": { - "texture": "backlights", - "tintindex": 0, - "uv": [4.0, 15.0, 12.0, 16.0] - } - } - } - ] -} diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json index 533eb164f..90fed86b0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright", - "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium", - "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark" + "lightsBright": "appliedenergistics2:parts/fluid_terminal_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_terminal_medium", + "lightsDark": "appliedenergistics2:parts/fluid_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json index e0f80b175..4b3fcf81c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/fluid_terminal/lights_bright", - "lightsMedium": "appliedenergistics2:parts/fluid_terminal/lights_medium", - "lightsDark": "appliedenergistics2:parts/fluid_terminal/lights_dark" + "lightsBright": "appliedenergistics2:parts/fluid_terminal_bright", + "lightsMedium": "appliedenergistics2:parts/fluid_terminal_medium", + "lightsDark": "appliedenergistics2:parts/fluid_terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png deleted file mode 100644 index f225dcf4be7ed02289b753871b62cb4ff19f5052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#Lza zT^vI!{F5bY9K1un?cX?0OJcV4s^rwe8``?w)UPmOVenkCWQjnlW7fi30t{&md3kzq zK2sQZd3hrYb9ot9uN~NxP*BMzua?1JD6yJx$0Q>&o*?e4W)B(~85x4FYS~FHYbs@6 PU|{fc^>bP0l+XkKnC47R diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png deleted file mode 100644 index b9ac516475da2c9d48542b31c16f9ebf46e89111..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#I>f zT^vI!{MYsvaxob49RBs+|9MpNf#w&Ngf*I3BaMrN*SN}hZxAchIT&?iBTIJRaUq0& n&GXK9xjSfr$f~x@{mOXL&f-(cg^*4L1_lOCS3j3^P6%BGDw7g~jx@no+!@$a|+g9>A^@Szh~8@YrI zHD6%}NH}<-<--c`j8ukoOL};luOvx0=pEDYu!%d!z_8x5yXeaweO?9z1_n=8KbLh* G2~7a^a8DQj diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png deleted file mode 100644 index aea3238540b479b7b51efe1b4ab11b6a404e7b02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#K1= zT^vI!{I~W5ay1z6IF|?LKk+R)T&E?ObHq&aw8003V|%xKei40QW0Q>biH}~3?zJTz za#CwP?yi<9yN2n*aCE>*how%O+U&BEN?-P~ zp6PkrD83?OK~SR?tCr}B5RHX@djgLwaNhLqwfv6U2_mapn5>?kV_;xl@O1TaS?83{ F1OPM=Pdoqs diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png deleted file mode 100644 index bf283814e1274d6e6f1e81e0ec10f72bcd4692f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#IRP zT^vI!{Fn9}iZNQt(i~Ov_>4$XJBAp@O1TaS?83{1ONjw BOG^L% diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png deleted file mode 100644 index 8b1f6f9f359d80e876a2f8d33e9d2fca3d980139..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#K`F zT^vI!{O_JIWMnYlVcOt%m_e`NW59DC7XR(a`RC3oxyZila)f|~*W>nv6e(^dhD;lI Z1@TWwLi?L%?gv@J;OXk;vd$@?2>_~zKdt}( diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png deleted file mode 100644 index 142f38511c2f61f1c9ec3acfbebd6bf52ec420f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#Ko5 zT^vI!{I8zbD0skt!#U6`nQ_~KRCcrQH%@akgv|Ti$0Zlu-z7cyYfiBAT=rF5!faRE z#954lLG*J*xms2G`x`nAw76$2=4N`=$H|&o*?e4W)B(~85x4FYS~FHYbs@6 PU|{fc^>bP0l+XkKnC47R diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png deleted file mode 100644 index b9ac516475da2c9d48542b31c16f9ebf46e89111..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#I>f zT^vI!{MYsvaxob49RBs+|9MpNf#w&Ngf*I3BaMrN*SN}hZxAchIT&?iBTIJRaUq0& n&GXK9xjSfr$f~x@{mOXL&f-(cg^*4L1_lOCS3j3^P6%BGDw7g~jx@no+!@$a|+g9>A^@Szh~8@YrI zHD6%}NH}<-<--c`j8ukoOL};luOvx0=pEDYu!%d!z_8x5yXeaweO?9z1_n=8KbLh* G2~7a^a8DQj diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png deleted file mode 100644 index 8b1f6f9f359d80e876a2f8d33e9d2fca3d980139..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#K`F zT^vI!{O_JIWMnYlVcOt%m_e`NW59DC7XR(a`RC3oxyZila)f|~*W>nv6e(^dhD;lI Z1@TWwLi?L%?gv@J;OXk;vd$@?2>_~zKdt}( diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png deleted file mode 100644 index 142f38511c2f61f1c9ec3acfbebd6bf52ec420f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7&r?&B8wRq z_?Ce%WBZ+z`3wvUQYEetCBgY=CFO}lsSE*$nRz98ey$-3WyX4@dWMGXpPkGZ7#Ko5 zT^vI!{I8zbD0skt!#U6`nQ_~KRCcrQH%@akgv|Ti$0Zlu-z7cyYfiBAT=rF5!faRE z#954lLG*J*xms2G`x`nAw76$2=4N`=$H| Date: Sun, 19 Jul 2020 14:14:18 +0200 Subject: [PATCH 10/19] Moved part textures from parts to part to be consistent with singular naming used in Minecraft (and for the model directory). --- .../appeng/block/qnb/QnbFormedBakedModel.java | 4 ++-- .../client/render/cablebus/CableBuilder.java | 10 ++++----- .../client/render/cablebus/CableCoreType.java | 2 +- .../cablebus/P2PTunnelFrequencyModel.java | 2 +- .../render/cablebus/SmartCableTextures.java | 20 +++++++++--------- .../block/wireless_access_point_chassis.json | 4 ++-- ...eless_access_point_status_has_channel.json | 2 +- .../wireless_access_point_status_off.json | 2 +- .../wireless_access_point_status_on.json | 2 +- .../models/item/annihilation_plane.json | 4 ++-- .../models/item/black_covered_cable.json | 2 +- .../item/black_covered_dense_cable.json | 2 +- .../models/item/black_glass_cable.json | 2 +- .../models/item/black_smart_cable.json | 2 +- .../models/item/black_smart_dense_cable.json | 2 +- .../models/item/blue_covered_cable.json | 2 +- .../models/item/blue_covered_dense_cable.json | 2 +- .../models/item/blue_glass_cable.json | 2 +- .../models/item/blue_smart_cable.json | 2 +- .../models/item/blue_smart_dense_cable.json | 2 +- .../models/item/brown_covered_cable.json | 2 +- .../item/brown_covered_dense_cable.json | 2 +- .../models/item/brown_glass_cable.json | 2 +- .../models/item/brown_smart_cable.json | 2 +- .../models/item/brown_smart_dense_cable.json | 2 +- .../models/item/cable_anchor.json | 4 ++-- .../models/item/cable_fluid_interface.json | 6 +++--- .../models/item/cable_interface.json | 6 +++--- .../models/item/conversion_monitor.json | 8 +++---- .../models/item/crafting_terminal.json | 8 +++---- .../models/item/cyan_covered_cable.json | 2 +- .../models/item/cyan_covered_dense_cable.json | 2 +- .../models/item/cyan_glass_cable.json | 2 +- .../models/item/cyan_smart_cable.json | 2 +- .../models/item/cyan_smart_dense_cable.json | 2 +- .../models/item/dark_monitor.json | 8 +++---- .../models/item/display_base.json | 6 +++--- .../models/item/export_bus.json | 6 +++--- .../models/item/facade_base.json | 4 ++-- .../models/item/fluid_annihilation_plane.json | 4 ++-- .../models/item/fluid_export_bus.json | 6 +++--- .../models/item/fluid_formation_plane.json | 2 +- .../models/item/fluid_import_bus.json | 6 +++--- .../models/item/fluid_level_emitter.json | 2 +- .../models/item/fluid_storage_bus.json | 6 +++--- .../models/item/fluid_terminal.json | 8 +++---- .../models/item/fluix_covered_cable.json | 2 +- .../item/fluix_covered_dense_cable.json | 2 +- .../models/item/fluix_glass_cable.json | 2 +- .../models/item/fluix_smart_cable.json | 2 +- .../models/item/fluix_smart_dense_cable.json | 2 +- .../models/item/formation_plane.json | 2 +- .../models/item/gray_covered_cable.json | 2 +- .../models/item/gray_covered_dense_cable.json | 2 +- .../models/item/gray_glass_cable.json | 2 +- .../models/item/gray_smart_cable.json | 2 +- .../models/item/gray_smart_dense_cable.json | 2 +- .../models/item/green_covered_cable.json | 2 +- .../item/green_covered_dense_cable.json | 2 +- .../models/item/green_glass_cable.json | 2 +- .../models/item/green_smart_cable.json | 2 +- .../models/item/green_smart_dense_cable.json | 2 +- .../item/identity_annihilation_plane.json | 2 +- .../models/item/import_bus.json | 6 +++--- .../models/item/interface_terminal.json | 8 +++---- .../models/item/inverted_toggle_bus.json | 2 +- .../models/item/level_emitter.json | 2 +- .../models/item/light_blue_covered_cable.json | 2 +- .../item/light_blue_covered_dense_cable.json | 2 +- .../models/item/light_blue_glass_cable.json | 2 +- .../models/item/light_blue_smart_cable.json | 2 +- .../item/light_blue_smart_dense_cable.json | 2 +- .../models/item/light_gray_covered_cable.json | 2 +- .../item/light_gray_covered_dense_cable.json | 2 +- .../models/item/light_gray_glass_cable.json | 2 +- .../models/item/light_gray_smart_cable.json | 2 +- .../item/light_gray_smart_dense_cable.json | 2 +- .../models/item/lime_covered_cable.json | 2 +- .../models/item/lime_covered_dense_cable.json | 2 +- .../models/item/lime_glass_cable.json | 2 +- .../models/item/lime_smart_cable.json | 2 +- .../models/item/lime_smart_dense_cable.json | 2 +- .../models/item/magenta_covered_cable.json | 2 +- .../item/magenta_covered_dense_cable.json | 2 +- .../models/item/magenta_glass_cable.json | 2 +- .../models/item/magenta_smart_cable.json | 2 +- .../item/magenta_smart_dense_cable.json | 2 +- .../models/item/monitor.json | 8 +++---- .../models/item/orange_covered_cable.json | 2 +- .../item/orange_covered_dense_cable.json | 2 +- .../models/item/orange_glass_cable.json | 2 +- .../models/item/orange_smart_cable.json | 2 +- .../models/item/orange_smart_dense_cable.json | 2 +- .../models/item/p2p_tunnel_base.json | 6 +++--- .../models/item/pattern_terminal.json | 8 +++---- .../models/item/pink_covered_cable.json | 2 +- .../models/item/pink_covered_dense_cable.json | 2 +- .../models/item/pink_glass_cable.json | 2 +- .../models/item/pink_smart_cable.json | 2 +- .../models/item/pink_smart_dense_cable.json | 2 +- .../models/item/purple_covered_cable.json | 2 +- .../item/purple_covered_dense_cable.json | 2 +- .../models/item/purple_glass_cable.json | 2 +- .../models/item/purple_smart_cable.json | 2 +- .../models/item/purple_smart_dense_cable.json | 2 +- .../models/item/quartz_fiber.json | 2 +- .../models/item/red_covered_cable.json | 2 +- .../models/item/red_covered_dense_cable.json | 2 +- .../models/item/red_glass_cable.json | 2 +- .../models/item/red_smart_cable.json | 2 +- .../models/item/red_smart_dense_cable.json | 2 +- .../models/item/semi_dark_monitor.json | 10 ++++----- .../models/item/smart_cable_base.json | 4 ++-- .../models/item/smart_dense_cable_base.json | 2 +- .../models/item/storage_bus.json | 6 +++--- .../models/item/storage_monitor.json | 8 +++---- .../models/item/terminal.json | 8 +++---- .../models/item/toggle_bus.json | 6 +++--- .../models/item/white_covered_cable.json | 2 +- .../item/white_covered_dense_cable.json | 2 +- .../models/item/white_glass_cable.json | 2 +- .../models/item/white_smart_cable.json | 2 +- .../models/item/white_smart_dense_cable.json | 2 +- .../models/item/wireless_access_point.json | 6 +++--- .../models/item/yellow_covered_cable.json | 2 +- .../item/yellow_covered_dense_cable.json | 2 +- .../models/item/yellow_glass_cable.json | 2 +- .../models/item/yellow_smart_cable.json | 2 +- .../models/item/yellow_smart_dense_cable.json | 2 +- .../models/part/annihilation_plane.json | 6 +++--- .../models/part/annihilation_plane_on.json | 6 +++--- .../models/part/cable/covered/center.json | 2 +- .../models/part/cable/covered/connection.json | 2 +- .../models/part/cable/covered/straight.json | 2 +- .../part/cable/dense_covered/center.json | 2 +- .../part/cable/dense_covered/connection.json | 2 +- .../part/cable/dense_covered/straight.json | 2 +- .../models/part/cable/dense_smart/center.json | 2 +- .../part/cable/dense_smart/connection.json | 4 ++-- .../part/cable/dense_smart/straight.json | 4 ++-- .../models/part/cable/glass/center.json | 2 +- .../models/part/cable/glass/connection.json | 2 +- .../models/part/cable/glass/straight.json | 2 +- .../models/part/cable/smart/center.json | 2 +- .../models/part/cable/smart/connection.json | 4 ++-- .../models/part/cable/smart/straight.json | 4 ++-- .../models/part/cable_anchor.json | 4 ++-- .../models/part/cable_anchor_short.json | 4 ++-- .../models/part/cable_facade.json | 4 ++-- .../part/conversion_monitor_locked_off.json | 6 +++--- .../part/conversion_monitor_locked_on.json | 6 +++--- .../models/part/conversion_monitor_off.json | 6 +++--- .../models/part/conversion_monitor_on.json | 6 +++--- .../models/part/crafting_terminal_off.json | 6 +++--- .../models/part/crafting_terminal_on.json | 6 +++--- .../models/part/display_base.json | 10 ++++----- .../models/part/display_off.json | 6 +++--- .../part/display_status_has_channel.json | 2 +- .../models/part/display_status_off.json | 2 +- .../models/part/display_status_on.json | 2 +- .../models/part/export_bus_base.json | 10 ++++----- .../models/part/export_bus_has_channel.json | 2 +- .../models/part/export_bus_off.json | 2 +- .../models/part/export_bus_on.json | 2 +- .../models/part/fluid_annihilation_plane.json | 6 +++--- .../part/fluid_annihilation_plane_on.json | 6 +++--- .../models/part/fluid_export_bus_base.json | 10 ++++----- .../part/fluid_export_bus_has_channel.json | 2 +- .../models/part/fluid_export_bus_off.json | 2 +- .../models/part/fluid_export_bus_on.json | 2 +- .../models/part/fluid_formation_plane.json | 6 +++--- .../models/part/fluid_formation_plane_on.json | 6 +++--- .../models/part/fluid_import_bus_base.json | 10 ++++----- .../part/fluid_import_bus_has_channel.json | 2 +- .../models/part/fluid_import_bus_off.json | 2 +- .../models/part/fluid_import_bus_on.json | 2 +- .../models/part/fluid_interface_base.json | 10 ++++----- .../part/fluid_interface_has_channel.json | 2 +- .../models/part/fluid_interface_off.json | 2 +- .../models/part/fluid_interface_on.json | 2 +- .../models/part/fluid_storage_bus_base.json | 10 ++++----- .../part/fluid_storage_bus_has_channel.json | 2 +- .../models/part/fluid_storage_bus_off.json | 2 +- .../models/part/fluid_storage_bus_on.json | 2 +- .../models/part/fluid_terminal_off.json | 6 +++--- .../models/part/fluid_terminal_on.json | 6 +++--- .../models/part/formation_plane.json | 6 +++--- .../models/part/formation_plane_on.json | 6 +++--- .../part/identity_annihilation_plane.json | 6 +++--- .../part/identity_annihilation_plane_on.json | 6 +++--- .../models/part/import_bus_base.json | 10 ++++----- .../models/part/import_bus_has_channel.json | 2 +- .../models/part/import_bus_off.json | 2 +- .../models/part/import_bus_on.json | 2 +- .../models/part/interface_base.json | 10 ++++----- .../models/part/interface_has_channel.json | 2 +- .../models/part/interface_off.json | 2 +- .../models/part/interface_on.json | 2 +- .../models/part/interface_terminal_off.json | 6 +++--- .../models/part/interface_terminal_on.json | 6 +++--- .../models/part/inverted_toggle_bus_base.json | 2 +- .../models/part/level_emitter_base_off.json | 6 +++--- .../models/part/level_emitter_base_on.json | 4 ++-- .../level_emitter_status_has_channel.json | 2 +- .../models/part/level_emitter_status_off.json | 2 +- .../models/part/level_emitter_status_on.json | 2 +- .../models/part/monitor_base.json | 8 +++---- .../models/part/monitor_bright_off.json | 2 +- .../models/part/monitor_bright_on.json | 2 +- .../models/part/monitor_dark_off.json | 2 +- .../models/part/monitor_dark_on.json | 2 +- .../models/part/monitor_medium_off.json | 2 +- .../models/part/monitor_medium_on.json | 2 +- .../models/part/p2p/p2p_tunnel_base.json | 10 ++++----- .../p2p/p2p_tunnel_status_has_channel.json | 2 +- .../part/p2p/p2p_tunnel_status_off.json | 2 +- .../models/part/p2p/p2p_tunnel_status_on.json | 2 +- .../models/part/pattern_terminal_off.json | 6 +++--- .../models/part/pattern_terminal_on.json | 6 +++--- .../models/part/quartz_fiber.json | 4 ++-- .../models/part/storage_bus_base.json | 10 ++++----- .../models/part/storage_bus_has_channel.json | 2 +- .../models/part/storage_bus_off.json | 2 +- .../models/part/storage_bus_on.json | 2 +- .../part/storage_monitor_locked_off.json | 6 +++--- .../part/storage_monitor_locked_on.json | 6 +++--- .../models/part/storage_monitor_off.json | 6 +++--- .../models/part/storage_monitor_on.json | 6 +++--- .../models/part/terminal_off.json | 6 +++--- .../models/part/terminal_on.json | 6 +++--- .../models/part/toggle_bus_base.json | 6 +++--- .../part/toggle_bus_status_has_channel.json | 2 +- .../models/part/toggle_bus_status_off.json | 2 +- .../models/part/toggle_bus_status_on.json | 2 +- .../part/transition_plane_has_channel.json | 6 +++--- .../models/part/transition_plane_off.json | 8 +++---- .../models/part/transition_plane_on.json | 8 +++---- .../{parts => part}/annihilation_plane.png | Bin .../{parts => part}/annihilation_plane_on.png | Bin .../annihilation_plane_on.png.mcmeta | 0 .../cable/core/covered/black.png | Bin .../cable/core/covered/blue.png | Bin .../cable/core/covered/brown.png | Bin .../cable/core/covered/cyan.png | Bin .../cable/core/covered/gray.png | Bin .../cable/core/covered/green.png | Bin .../cable/core/covered/light_blue.png | Bin .../cable/core/covered/light_gray.png | Bin .../cable/core/covered/lime.png | Bin .../cable/core/covered/magenta.png | Bin .../cable/core/covered/orange.png | Bin .../cable/core/covered/pink.png | Bin .../cable/core/covered/purple.png | Bin .../cable/core/covered/red.png | Bin .../cable/core/covered/transparent.png | Bin .../cable/core/covered/white.png | Bin .../cable/core/covered/yellow.png | Bin .../cable/core/dense_smart/black.png | Bin .../cable/core/dense_smart/blue.png | Bin .../cable/core/dense_smart/brown.png | Bin .../cable/core/dense_smart/cyan.png | Bin .../cable/core/dense_smart/gray.png | Bin .../cable/core/dense_smart/green.png | Bin .../cable/core/dense_smart/light_blue.png | Bin .../cable/core/dense_smart/light_gray.png | Bin .../cable/core/dense_smart/lime.png | Bin .../cable/core/dense_smart/magenta.png | Bin .../cable/core/dense_smart/orange.png | Bin .../cable/core/dense_smart/pink.png | Bin .../cable/core/dense_smart/purple.png | Bin .../cable/core/dense_smart/red.png | Bin .../cable/core/dense_smart/transparent.png | Bin .../cable/core/dense_smart/white.png | Bin .../cable/core/dense_smart/yellow.png | Bin .../cable/core/glass/black.png | Bin .../{parts => part}/cable/core/glass/blue.png | Bin .../cable/core/glass/brown.png | Bin .../{parts => part}/cable/core/glass/cyan.png | Bin .../{parts => part}/cable/core/glass/gray.png | Bin .../cable/core/glass/green.png | Bin .../cable/core/glass/light_blue.png | Bin .../cable/core/glass/light_gray.png | Bin .../{parts => part}/cable/core/glass/lime.png | Bin .../cable/core/glass/magenta.png | Bin .../cable/core/glass/orange.png | Bin .../{parts => part}/cable/core/glass/pink.png | Bin .../cable/core/glass/purple.png | Bin .../{parts => part}/cable/core/glass/red.png | Bin .../cable/core/glass/transparent.png | Bin .../cable/core/glass/white.png | Bin .../cable/core/glass/yellow.png | Bin .../{parts => part}/cable/covered/black.png | Bin .../{parts => part}/cable/covered/blue.png | Bin .../{parts => part}/cable/covered/brown.png | Bin .../{parts => part}/cable/covered/cyan.png | Bin .../{parts => part}/cable/covered/gray.png | Bin .../{parts => part}/cable/covered/green.png | Bin .../cable/covered/light_blue.png | Bin .../cable/covered/light_gray.png | Bin .../{parts => part}/cable/covered/lime.png | Bin .../{parts => part}/cable/covered/magenta.png | Bin .../{parts => part}/cable/covered/orange.png | Bin .../{parts => part}/cable/covered/pink.png | Bin .../{parts => part}/cable/covered/purple.png | Bin .../{parts => part}/cable/covered/red.png | Bin .../cable/covered/transparent.png | Bin .../{parts => part}/cable/covered/white.png | Bin .../{parts => part}/cable/covered/yellow.png | Bin .../cable/dense_covered/black.png | Bin .../cable/dense_covered/blue.png | Bin .../cable/dense_covered/brown.png | Bin .../cable/dense_covered/cyan.png | Bin .../cable/dense_covered/gray.png | Bin .../cable/dense_covered/green.png | Bin .../cable/dense_covered/light_blue.png | Bin .../cable/dense_covered/light_gray.png | Bin .../cable/dense_covered/lime.png | Bin .../cable/dense_covered/magenta.png | Bin .../cable/dense_covered/orange.png | Bin .../cable/dense_covered/pink.png | Bin .../cable/dense_covered/purple.png | Bin .../cable/dense_covered/red.png | Bin .../cable/dense_covered/transparent.png | Bin .../cable/dense_covered/white.png | Bin .../cable/dense_covered/yellow.png | Bin .../{parts => part}/cable/dense_smart/0.png | Bin .../{parts => part}/cable/dense_smart/1.png | Bin .../{parts => part}/cable/dense_smart/10.png | Bin .../{parts => part}/cable/dense_smart/11.png | Bin .../{parts => part}/cable/dense_smart/12.png | Bin .../{parts => part}/cable/dense_smart/13.png | Bin .../{parts => part}/cable/dense_smart/14.png | Bin .../{parts => part}/cable/dense_smart/15.png | Bin .../{parts => part}/cable/dense_smart/16.png | Bin .../{parts => part}/cable/dense_smart/17.png | Bin .../{parts => part}/cable/dense_smart/18.png | Bin .../{parts => part}/cable/dense_smart/19.png | Bin .../{parts => part}/cable/dense_smart/2.png | Bin .../{parts => part}/cable/dense_smart/20.png | Bin .../{parts => part}/cable/dense_smart/21.png | Bin .../{parts => part}/cable/dense_smart/22.png | Bin .../{parts => part}/cable/dense_smart/23.png | Bin .../{parts => part}/cable/dense_smart/24.png | Bin .../{parts => part}/cable/dense_smart/25.png | Bin .../{parts => part}/cable/dense_smart/26.png | Bin .../{parts => part}/cable/dense_smart/27.png | Bin .../{parts => part}/cable/dense_smart/28.png | Bin .../{parts => part}/cable/dense_smart/29.png | Bin .../{parts => part}/cable/dense_smart/3.png | Bin .../{parts => part}/cable/dense_smart/30.png | Bin .../{parts => part}/cable/dense_smart/31.png | Bin .../{parts => part}/cable/dense_smart/32.png | Bin .../{parts => part}/cable/dense_smart/4.png | Bin .../{parts => part}/cable/dense_smart/5.png | Bin .../{parts => part}/cable/dense_smart/6.png | Bin .../{parts => part}/cable/dense_smart/7.png | Bin .../{parts => part}/cable/dense_smart/8.png | Bin .../{parts => part}/cable/dense_smart/9.png | Bin .../cable/dense_smart/black.png | Bin .../cable/dense_smart/blue.png | Bin .../cable/dense_smart/brown.png | Bin .../cable/dense_smart/cyan.png | Bin .../cable/dense_smart/gray.png | Bin .../cable/dense_smart/green.png | Bin .../cable/dense_smart/light_blue.png | Bin .../cable/dense_smart/light_gray.png | Bin .../cable/dense_smart/lime.png | Bin .../cable/dense_smart/magenta.png | Bin .../cable/dense_smart/orange.png | Bin .../cable/dense_smart/pink.png | Bin .../cable/dense_smart/purple.png | Bin .../{parts => part}/cable/dense_smart/red.png | Bin .../cable/dense_smart/transparent.png | Bin .../cable/dense_smart/white.png | Bin .../cable/dense_smart/yellow.png | Bin .../{parts => part}/cable/glass/black.png | Bin .../{parts => part}/cable/glass/blue.png | Bin .../{parts => part}/cable/glass/brown.png | Bin .../{parts => part}/cable/glass/cyan.png | Bin .../{parts => part}/cable/glass/gray.png | Bin .../{parts => part}/cable/glass/green.png | Bin .../cable/glass/light_blue.png | Bin .../cable/glass/light_gray.png | Bin .../{parts => part}/cable/glass/lime.png | Bin .../{parts => part}/cable/glass/magenta.png | Bin .../{parts => part}/cable/glass/orange.png | Bin .../{parts => part}/cable/glass/pink.png | Bin .../{parts => part}/cable/glass/purple.png | Bin .../{parts => part}/cable/glass/red.png | Bin .../cable/glass/transparent.png | Bin .../{parts => part}/cable/glass/white.png | Bin .../{parts => part}/cable/glass/yellow.png | Bin .../{parts => part}/cable/smart/black.png | Bin .../{parts => part}/cable/smart/blue.png | Bin .../{parts => part}/cable/smart/brown.png | Bin .../cable/smart/channels_00.png | Bin .../cable/smart/channels_01.png | Bin .../cable/smart/channels_02.png | Bin .../cable/smart/channels_03.png | Bin .../cable/smart/channels_04.png | Bin .../cable/smart/channels_10.png | Bin .../cable/smart/channels_11.png | Bin .../cable/smart/channels_12.png | Bin .../cable/smart/channels_13.png | Bin .../cable/smart/channels_14.png | Bin .../{parts => part}/cable/smart/cyan.png | Bin .../{parts => part}/cable/smart/gray.png | Bin .../{parts => part}/cable/smart/green.png | Bin .../cable/smart/light_blue.png | Bin .../cable/smart/light_gray.png | Bin .../{parts => part}/cable/smart/lime.png | Bin .../{parts => part}/cable/smart/magenta.png | Bin .../{parts => part}/cable/smart/orange.png | Bin .../{parts => part}/cable/smart/pink.png | Bin .../{parts => part}/cable/smart/purple.png | Bin .../{parts => part}/cable/smart/red.png | Bin .../cable/smart/transparent.png | Bin .../{parts => part}/cable/smart/white.png | Bin .../{parts => part}/cable/smart/yellow.png | Bin .../textures/{parts => part}/cable_anchor.png | Bin .../{parts => part}/conversion_monitor.png | Bin .../conversion_monitor_bright.png | Bin .../conversion_monitor_dark.png | Bin .../conversion_monitor_medium.png | Bin .../conversion_monitor_medium_locked.png | Bin .../{parts => part}/crafting_terminal.png | Bin .../crafting_terminal_bright.png | Bin .../crafting_terminal_dark.png | Bin .../crafting_terminal_medium.png | Bin .../textures/{parts => part}/export_bus.png | Bin .../{parts => part}/export_bus_sides.png | Bin .../fluid_annihilation_plane.png | Bin .../fluid_annihilation_plane_on.png | Bin .../fluid_annihilation_plane_on.png.mcmeta | 0 .../{parts => part}/fluid_export_bus.png | Bin .../{parts => part}/fluid_formation_plane.png | Bin .../fluid_formation_plane_on.png | Bin .../fluid_formation_plane_on.png.mcmeta | 0 .../{parts => part}/fluid_import_bus.png | Bin .../{parts => part}/fluid_interface.png | Bin .../{parts => part}/fluid_storage_bus.png | Bin .../{parts => part}/fluid_terminal.png | Bin .../{parts => part}/fluid_terminal_bright.png | Bin .../{parts => part}/fluid_terminal_dark.png | Bin .../{parts => part}/fluid_terminal_medium.png | Bin .../{parts => part}/formation_plane.png | Bin .../{parts => part}/formation_plane_on.png | Bin .../formation_plane_on.png.mcmeta | 0 .../identity_annihilation_plane.png | Bin .../identity_annihilation_plane_on.png | Bin .../identity_annihilation_plane_on.png.mcmeta | 0 .../textures/{parts => part}/import_bus.png | Bin .../{parts => part}/import_bus_sides.png | Bin .../textures/{parts => part}/interface.png | Bin .../{parts => part}/interface_terminal.png | Bin .../interface_terminal_bright.png | Bin .../interface_terminal_dark.png | Bin .../interface_terminal_medium.png | Bin .../{parts => part}/inverted_toggle_bus.png | Bin .../{parts => part}/level_emitter_off.png | Bin .../{parts => part}/level_emitter_on.png | Bin .../textures/{parts => part}/monitor_back.png | Bin .../{parts => part}/monitor_bright.png | Bin .../{parts => part}/monitor_colored.png | Bin .../{parts => part}/monitor_front.png | Bin .../{parts => part}/monitor_light.png | Bin .../{parts => part}/monitor_sides.png | Bin .../{parts => part}/monitor_sides_status.png | Bin .../monitor_sides_status_has_channel.png | Bin .../monitor_sides_status_off.png | Bin .../monitor_sides_status_on.png | Bin .../{parts => part}/p2p_tunnel_back.png | Bin .../{parts => part}/p2p_tunnel_back2.png | Bin .../{parts => part}/p2p_tunnel_frequency.png | Bin .../{parts => part}/p2p_tunnel_front.png | Bin .../{parts => part}/p2p_tunnel_sides.png | Bin .../{parts => part}/pattern_terminal.png | Bin .../pattern_terminal_bright.png | Bin .../{parts => part}/pattern_terminal_dark.png | Bin .../pattern_terminal_medium.png | Bin .../textures/{parts => part}/plane_sides.png | Bin .../textures/{parts => part}/quartz_fiber.png | Bin .../textures/{parts => part}/storage_bus.png | Bin .../{parts => part}/storage_bus_back.png | Bin .../{parts => part}/storage_bus_sides.png | Bin .../{parts => part}/storage_monitor.png | Bin .../storage_monitor_bright.png | Bin .../{parts => part}/storage_monitor_dark.png | Bin .../storage_monitor_dark_locked.png | Bin .../storage_monitor_medium.png | Bin .../textures/{parts => part}/terminal.png | Bin .../{parts => part}/terminal_bright.png | Bin .../{parts => part}/terminal_dark.png | Bin .../{parts => part}/terminal_medium.png | Bin .../textures/{parts => part}/toggle_bus.png | Bin .../{parts => part}/transition_plane_back.png | Bin 496 files changed, 434 insertions(+), 434 deletions(-) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/annihilation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/annihilation_plane_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/annihilation_plane_on.png.mcmeta (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/covered/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/dense_smart/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/core/glass/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/covered/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_covered/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/0.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/1.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/10.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/11.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/12.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/13.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/14.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/15.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/16.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/17.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/18.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/19.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/2.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/20.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/21.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/22.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/23.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/24.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/25.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/26.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/27.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/28.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/29.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/3.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/30.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/31.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/32.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/4.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/5.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/6.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/7.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/8.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/9.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/dense_smart/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/glass/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/black.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/brown.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_00.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_01.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_02.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_03.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_04.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_10.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_11.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_12.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_13.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/channels_14.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/cyan.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/green.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/light_blue.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/light_gray.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/lime.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/magenta.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/orange.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/pink.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/purple.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/red.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/transparent.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/white.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable/smart/yellow.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/cable_anchor.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/conversion_monitor.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/conversion_monitor_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/conversion_monitor_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/conversion_monitor_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/conversion_monitor_medium_locked.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/crafting_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/crafting_terminal_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/crafting_terminal_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/crafting_terminal_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/export_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/export_bus_sides.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_annihilation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_annihilation_plane_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_annihilation_plane_on.png.mcmeta (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_export_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_formation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_formation_plane_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_formation_plane_on.png.mcmeta (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_import_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_interface.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_storage_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_terminal_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_terminal_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/fluid_terminal_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/formation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/formation_plane_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/formation_plane_on.png.mcmeta (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/identity_annihilation_plane.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/identity_annihilation_plane_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/identity_annihilation_plane_on.png.mcmeta (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/import_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/import_bus_sides.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/interface.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/interface_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/interface_terminal_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/interface_terminal_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/interface_terminal_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/inverted_toggle_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/level_emitter_off.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/level_emitter_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_back.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_colored.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_front.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_light.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_sides.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_sides_status.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_sides_status_has_channel.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_sides_status_off.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/monitor_sides_status_on.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/p2p_tunnel_back.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/p2p_tunnel_back2.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/p2p_tunnel_frequency.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/p2p_tunnel_front.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/p2p_tunnel_sides.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/pattern_terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/pattern_terminal_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/pattern_terminal_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/pattern_terminal_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/plane_sides.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/quartz_fiber.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_bus_back.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_bus_sides.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_monitor.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_monitor_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_monitor_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_monitor_dark_locked.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/storage_monitor_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/terminal.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/terminal_bright.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/terminal_dark.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/terminal_medium.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/toggle_bus.png (100%) rename src/main/resources/assets/appliedenergistics2/textures/{parts => part}/transition_plane_back.png (100%) diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index e594dd10e..e189d1bf8 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -41,9 +41,9 @@ class QnbFormedBakedModel implements IDynamicBakedModel { private static final Material TEXTURE_RING_LIGHT_CORNER = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(AppEng.MOD_ID, "block/quantum_ring_light_corner")); private static final Material TEXTURE_CABLE_GLASS = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "parts/cable/glass/transparent")); + new ResourceLocation(AppEng.MOD_ID, "part/cable/glass/transparent")); private static final Material TEXTURE_COVERED_CABLE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "parts/cable/covered/transparent")); + new ResourceLocation(AppEng.MOD_ID, "part/cable/covered/transparent")); private static final float DEFAULT_RENDER_MIN = 2.0f; private static final float DEFAULT_RENDER_MAX = 14.0f; diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index dff5d8897..ea650e1e7 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -81,19 +81,19 @@ class CableBuilder { String textureFolder; switch (cableType) { case GLASS: - textureFolder = "parts/cable/glass/"; + textureFolder = "part/cable/glass/"; break; case COVERED: - textureFolder = "parts/cable/covered/"; + textureFolder = "part/cable/covered/"; break; case SMART: - textureFolder = "parts/cable/smart/"; + textureFolder = "part/cable/smart/"; break; case DENSE_COVERED: - textureFolder = "parts/cable/dense_covered/"; + textureFolder = "part/cable/dense_covered/"; break; case DENSE_SMART: - textureFolder = "parts/cable/dense_smart/"; + textureFolder = "part/cable/dense_smart/"; break; default: throw new IllegalStateException("Cable type " + cableType + " does not support connections."); diff --git a/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java index 4cdb6aefe..f5f218ed7 100644 --- a/src/main/java/appeng/client/render/cablebus/CableCoreType.java +++ b/src/main/java/appeng/client/render/cablebus/CableCoreType.java @@ -37,7 +37,7 @@ import appeng.core.AppEng; * Covered (also used by the Smart Cable) - Dense */ public enum CableCoreType { - GLASS("parts/cable/core/glass"), COVERED("parts/cable/core/covered"), DENSE("parts/cable/core/dense_smart"); + GLASS("part/cable/core/glass"), COVERED("part/cable/core/covered"), DENSE("part/cable/core/dense_smart"); private static final Map cableMapping = generateCableMapping(); diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java index d89254a7f..9839e67f1 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java @@ -23,7 +23,7 @@ import appeng.core.AppEng; public class P2PTunnelFrequencyModel implements IModelGeometry { private static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, - new ResourceLocation(AppEng.MOD_ID, "parts/p2p_tunnel_frequency")); + new ResourceLocation(AppEng.MOD_ID, "part/p2p_tunnel_frequency")); @Override public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java index 93610b014..221df809c 100644 --- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java +++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java @@ -34,16 +34,16 @@ import appeng.core.AppEng; public class SmartCableTextures { public static final Material[] SMART_CHANNELS_TEXTURES = Arrays - .stream(new ResourceLocation[] { new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_00"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_01"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_02"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_03"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_04"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_10"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_11"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_12"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_13"), // - new ResourceLocation(AppEng.MOD_ID, "parts/cable/smart/channels_14")// + .stream(new ResourceLocation[] { new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_00"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_01"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_02"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_03"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_04"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_10"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_11"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_12"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_13"), // + new ResourceLocation(AppEng.MOD_ID, "part/cable/smart/channels_14")// }).map(e -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, e)).toArray(Material[]::new); // Textures used to display channels on smart cables. There's two sets of 5 diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json index a37ea30df..efd46a52c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json @@ -4,8 +4,8 @@ "particle": "appliedenergistics2:block/wireless_access_point_inside", "inside": "appliedenergistics2:block/wireless_access_point_inside", "1": "appliedenergistics2:block/wireless_access_point", - "sides": "appliedenergistics2:parts/monitor_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status" + "sides": "appliedenergistics2:part/monitor_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json index d42f0d34e..22a9db566 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json index f599d2021..4143ee40c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json index d1a6fa3f5..784ba620c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json index bbd62a31b..71173ef77 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/plane_sides", - "plane": "appliedenergistics2:parts/annihilation_plane" + "sides": "appliedenergistics2:part/plane_sides", + "plane": "appliedenergistics2:part/annihilation_plane" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json index 973e0a129..0bec772b1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/black" + "base": "appliedenergistics2:part/cable/covered/black" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json index 1b9ec6a27..b42cf08be 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/black" + "base": "appliedenergistics2:part/cable/dense_covered/black" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json index 1d91ffe55..3d2daa8cb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/black" + "base": "appliedenergistics2:part/cable/glass/black" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json index 80b36ab81..f66a8ed9d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/black" + "base": "appliedenergistics2:part/cable/smart/black" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json index 9432f2771..92c87dac0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/black" + "base": "appliedenergistics2:part/cable/dense_smart/black" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json index 669edac6c..799cff9fb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/blue" + "base": "appliedenergistics2:part/cable/covered/blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json index 63e43ea1a..e553fde4c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/blue" + "base": "appliedenergistics2:part/cable/dense_covered/blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json index 1b41688bc..a51ab3d71 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/blue" + "base": "appliedenergistics2:part/cable/glass/blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json index 092c8803b..d1eb34695 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/blue" + "base": "appliedenergistics2:part/cable/smart/blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json index a7d946674..1498b5b14 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/blue" + "base": "appliedenergistics2:part/cable/dense_smart/blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json index e4b2a74bc..c2694d5ed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/brown" + "base": "appliedenergistics2:part/cable/covered/brown" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json index 31342c355..debf94b3e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/brown" + "base": "appliedenergistics2:part/cable/dense_covered/brown" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json index 435b1263f..0786dcbf9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/brown" + "base": "appliedenergistics2:part/cable/glass/brown" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json index 6deda77d4..7d239cbfd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/brown" + "base": "appliedenergistics2:part/cable/smart/brown" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json index 96b8dd812..160291ed3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/brown" + "base": "appliedenergistics2:part/cable/dense_smart/brown" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json index 5afae16cc..f8bbda073 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "all": "appliedenergistics2:parts/cable_anchor", - "particle": "appliedenergistics2:parts/cable_anchor" + "all": "appliedenergistics2:part/cable_anchor", + "particle": "appliedenergistics2:part/cable_anchor" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json index 255ee8002..7d834414b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/fluid_interface" + "sides": "appliedenergistics2:part/monitor_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/fluid_interface" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json index f2fde2052..d16ad5bae 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/interface" + "sides": "appliedenergistics2:part/monitor_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/interface" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json index ebe38591d..7ce9c994c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/conversion_monitor", - "front_bright": "appliedenergistics2:parts/conversion_monitor_bright", - "front_medium": "appliedenergistics2:parts/conversion_monitor_medium", - "front_dark": "appliedenergistics2:parts/conversion_monitor_dark" + "front": "appliedenergistics2:part/conversion_monitor", + "front_bright": "appliedenergistics2:part/conversion_monitor_bright", + "front_medium": "appliedenergistics2:part/conversion_monitor_medium", + "front_dark": "appliedenergistics2:part/conversion_monitor_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json index 2b4f59ac0..a346581d9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/crafting_terminal", - "front_bright": "appliedenergistics2:parts/crafting_terminal_bright", - "front_medium": "appliedenergistics2:parts/crafting_terminal_medium", - "front_dark": "appliedenergistics2:parts/crafting_terminal_dark" + "front": "appliedenergistics2:part/crafting_terminal", + "front_bright": "appliedenergistics2:part/crafting_terminal_bright", + "front_medium": "appliedenergistics2:part/crafting_terminal_medium", + "front_dark": "appliedenergistics2:part/crafting_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json index 8221ffdf1..e609419ce 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/cyan" + "base": "appliedenergistics2:part/cable/covered/cyan" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json index b91653cdc..e284a2487 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/cyan" + "base": "appliedenergistics2:part/cable/dense_covered/cyan" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json index e27d40091..358d63204 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/cyan" + "base": "appliedenergistics2:part/cable/glass/cyan" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json index ae2af797b..fadd77273 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/cyan" + "base": "appliedenergistics2:part/cable/smart/cyan" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json index cc988f273..e1733b1d4 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/cyan" + "base": "appliedenergistics2:part/cable/dense_smart/cyan" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json index 1102fd78a..844a30505 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/monitor_front", - "front_bright": "appliedenergistics2:parts/monitor_colored", - "front_medium": "appliedenergistics2:parts/monitor_bright", - "front_dark": "appliedenergistics2:parts/monitor_colored" + "front": "appliedenergistics2:part/monitor_front", + "front_bright": "appliedenergistics2:part/monitor_colored", + "front_medium": "appliedenergistics2:part/monitor_bright", + "front_dark": "appliedenergistics2:part/monitor_colored" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/display_base.json b/src/main/resources/assets/appliedenergistics2/models/item/display_base.json index 671d69a7f..02d62f146 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/display_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/display_base.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front_medium_bright": "appliedenergistics2:parts/monitor_colored" + "sides": "appliedenergistics2:part/monitor_sides", + "back": "appliedenergistics2:part/monitor_back", + "front_medium_bright": "appliedenergistics2:part/monitor_colored" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json index cab7d7419..1bdb802ad 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/export_bus" + "sides": "appliedenergistics2:part/export_bus_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/export_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json b/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json index 8023830c0..5e119a0e3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "anchor": "appliedenergistics2:parts/cable_anchor", - "particle": "appliedenergistics2:parts/cable_anchor" + "anchor": "appliedenergistics2:part/cable_anchor", + "particle": "appliedenergistics2:part/cable_anchor" }, "display": { "gui": { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json index 59d4a9cd6..1cc1eb6bb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/plane_sides", - "plane": "appliedenergistics2:parts/fluid_annihilation_plane" + "sides": "appliedenergistics2:part/plane_sides", + "plane": "appliedenergistics2:part/fluid_annihilation_plane" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json index 231fc2d98..107d8242f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/fluid_export_bus" + "sides": "appliedenergistics2:part/export_bus_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/fluid_export_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json index 6533d4ec3..df83ad7c7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/annihilation_plane", "textures": { - "plane": "appliedenergistics2:parts/fluid_formation_plane" + "plane": "appliedenergistics2:part/fluid_formation_plane" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json index 559832e60..9ed0a9c9e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/import_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/fluid_import_bus" + "sides": "appliedenergistics2:part/import_bus_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/fluid_import_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json index 1c8e662bc..3e85e7147 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "emitter": "appliedenergistics2:parts/level_emitter_off" + "emitter": "appliedenergistics2:part/level_emitter_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json index 41a28a51c..e6fa64fb6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/storage_bus_sides", - "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:parts/fluid_storage_bus" + "sides": "appliedenergistics2:part/storage_bus_sides", + "back": "appliedenergistics2:part/storage_bus_back", + "front": "appliedenergistics2:part/fluid_storage_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json index f123a10aa..5c37b365f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/crafting_terminal", - "front_bright": "appliedenergistics2:parts/fluid_terminal_bright", - "front_medium": "appliedenergistics2:parts/fluid_terminal_medium", - "front_dark": "appliedenergistics2:parts/fluid_terminal_dark" + "front": "appliedenergistics2:part/crafting_terminal", + "front_bright": "appliedenergistics2:part/fluid_terminal_bright", + "front_medium": "appliedenergistics2:part/fluid_terminal_medium", + "front_dark": "appliedenergistics2:part/fluid_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json index 6731bbbca..9ac734675 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/transparent" + "base": "appliedenergistics2:part/cable/covered/transparent" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json index 013f45a21..6ff623c5b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/transparent" + "base": "appliedenergistics2:part/cable/dense_covered/transparent" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json index 3a98fe454..47977adab 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/transparent" + "base": "appliedenergistics2:part/cable/glass/transparent" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json index 374b96dbf..44ba86e3e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/transparent" + "base": "appliedenergistics2:part/cable/smart/transparent" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json index 37ad17c3f..f18cfb5f2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/transparent" + "base": "appliedenergistics2:part/cable/dense_smart/transparent" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json index a92535a77..8caafcc0e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/annihilation_plane", "textures": { - "plane": "appliedenergistics2:parts/formation_plane" + "plane": "appliedenergistics2:part/formation_plane" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json index fd8b4abd7..7c1fc8fee 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/gray" + "base": "appliedenergistics2:part/cable/covered/gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json index 20e96c5b9..16f159949 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/gray" + "base": "appliedenergistics2:part/cable/dense_covered/gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json index f84511d1b..57919d142 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/gray" + "base": "appliedenergistics2:part/cable/glass/gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json index 5faad7a95..dc2a1cd28 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/gray" + "base": "appliedenergistics2:part/cable/smart/gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json index 5089cb3cc..0da21bfda 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/gray" + "base": "appliedenergistics2:part/cable/dense_smart/gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json index fc361952c..c8aa2bd38 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/green" + "base": "appliedenergistics2:part/cable/covered/green" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json index b232c4b22..5981da7a7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/green" + "base": "appliedenergistics2:part/cable/dense_covered/green" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json index 90d416858..bfb49774f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/green" + "base": "appliedenergistics2:part/cable/glass/green" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json index e0363a7c7..93f5286c0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/green" + "base": "appliedenergistics2:part/cable/smart/green" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json index ac7aa7eb9..91a389092 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/green" + "base": "appliedenergistics2:part/cable/dense_smart/green" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json index a2880b51e..4b03a1fb2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/annihilation_plane", "textures": { - "plane": "appliedenergistics2:parts/identity_annihilation_plane" + "plane": "appliedenergistics2:part/identity_annihilation_plane" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json index 889aaafce..38f9850f1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/import_bus_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/import_bus" + "sides": "appliedenergistics2:part/import_bus_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/import_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json index 2e85ef625..dee86284b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/interface_terminal", - "front_bright": "appliedenergistics2:parts/interface_terminal_bright", - "front_medium": "appliedenergistics2:parts/interface_terminal_medium", - "front_dark": "appliedenergistics2:parts/interface_terminal_dark" + "front": "appliedenergistics2:part/interface_terminal", + "front_bright": "appliedenergistics2:part/interface_terminal_bright", + "front_medium": "appliedenergistics2:part/interface_terminal_medium", + "front_dark": "appliedenergistics2:part/interface_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json index 5be0fb7d6..cd3050423 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/toggle_bus", "textures": { - "bus": "appliedenergistics2:parts/inverted_toggle_bus" + "bus": "appliedenergistics2:part/inverted_toggle_bus" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json index 1c8e662bc..3e85e7147 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "emitter": "appliedenergistics2:parts/level_emitter_off" + "emitter": "appliedenergistics2:part/level_emitter_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json index bc18d3549..2907ad1fa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/light_blue" + "base": "appliedenergistics2:part/cable/covered/light_blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json index 78cfbbea3..146505596 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/light_blue" + "base": "appliedenergistics2:part/cable/dense_covered/light_blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json index 58b7f723b..84dd79158 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/light_blue" + "base": "appliedenergistics2:part/cable/glass/light_blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json index c5daac955..ea2dd766e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/light_blue" + "base": "appliedenergistics2:part/cable/smart/light_blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json index d46cc2fd1..b8795f43e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/light_blue" + "base": "appliedenergistics2:part/cable/dense_smart/light_blue" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json index f881cfe10..57028191a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/light_gray" + "base": "appliedenergistics2:part/cable/covered/light_gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json index 39302d96d..7115d8c8e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/light_gray" + "base": "appliedenergistics2:part/cable/dense_covered/light_gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json index 8ba311c3d..f5964932d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/light_gray" + "base": "appliedenergistics2:part/cable/glass/light_gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json index bb66a640d..4e6fc7a22 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/light_gray" + "base": "appliedenergistics2:part/cable/smart/light_gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json index 181898bd7..d8d2a6b1c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/light_gray" + "base": "appliedenergistics2:part/cable/dense_smart/light_gray" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json index 7dfc9da31..a189d6e2a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/lime" + "base": "appliedenergistics2:part/cable/covered/lime" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json index b9583ee74..f2ad86040 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/lime" + "base": "appliedenergistics2:part/cable/dense_covered/lime" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json index c40012f01..befc43be0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/lime" + "base": "appliedenergistics2:part/cable/glass/lime" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json index 1bd5973f0..a9001b8d1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/lime" + "base": "appliedenergistics2:part/cable/smart/lime" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json index 6d746f9d7..b92dcf4a0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/lime" + "base": "appliedenergistics2:part/cable/dense_smart/lime" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json index b58b59583..ca4666cee 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/magenta" + "base": "appliedenergistics2:part/cable/covered/magenta" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json index 826c59f4a..d7ae5b7fd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/magenta" + "base": "appliedenergistics2:part/cable/dense_covered/magenta" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json index 5bf8f37f3..204d9aa1f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/magenta" + "base": "appliedenergistics2:part/cable/glass/magenta" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json index 281e48ef9..a8790eb5e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/magenta" + "base": "appliedenergistics2:part/cable/smart/magenta" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json index d72d894e5..f88bec3ce 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/magenta" + "base": "appliedenergistics2:part/cable/dense_smart/magenta" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/monitor.json index 43d32bf05..804d6aa00 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/monitor.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/crafting_terminal", - "front_bright": "appliedenergistics2:parts/monitor_bright", - "front_medium": "appliedenergistics2:parts/monitor_colored", - "front_dark": "appliedenergistics2:parts/monitor_colored" + "front": "appliedenergistics2:part/crafting_terminal", + "front_bright": "appliedenergistics2:part/monitor_bright", + "front_medium": "appliedenergistics2:part/monitor_colored", + "front_dark": "appliedenergistics2:part/monitor_colored" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json index c4bfb88be..b5874337a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/orange" + "base": "appliedenergistics2:part/cable/covered/orange" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json index efe24a7d7..6f3a0b091 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/orange" + "base": "appliedenergistics2:part/cable/dense_covered/orange" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json index 85665fe3a..062f3b48d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/orange" + "base": "appliedenergistics2:part/cable/glass/orange" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json index 08b5208b6..a011e435e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/orange" + "base": "appliedenergistics2:part/cable/smart/orange" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json index 4a5653322..7345f6946 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/orange" + "base": "appliedenergistics2:part/cable/dense_smart/orange" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json b/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json index 43f236cb6..4ee14ff30 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/p2p_tunnel_sides", - "back": "appliedenergistics2:parts/p2p_tunnel_back", - "front": "appliedenergistics2:parts/p2p_tunnel_front", + "sides": "appliedenergistics2:part/p2p_tunnel_sides", + "back": "appliedenergistics2:part/p2p_tunnel_back", + "front": "appliedenergistics2:part/p2p_tunnel_front", "type": "appliedenergistics2:block/quartz_block" }, "elements": [ diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json index 98cef6642..6faa06289 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/pattern_terminal", - "front_bright": "appliedenergistics2:parts/pattern_terminal_bright", - "front_medium": "appliedenergistics2:parts/pattern_terminal_medium", - "front_dark": "appliedenergistics2:parts/pattern_terminal_dark" + "front": "appliedenergistics2:part/pattern_terminal", + "front_bright": "appliedenergistics2:part/pattern_terminal_bright", + "front_medium": "appliedenergistics2:part/pattern_terminal_medium", + "front_dark": "appliedenergistics2:part/pattern_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json index 5f0175a32..f5743be2a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/pink" + "base": "appliedenergistics2:part/cable/covered/pink" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json index 77992d29f..cdca4d37e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/pink" + "base": "appliedenergistics2:part/cable/dense_covered/pink" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json index 29e81c3a4..036d220c3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/pink" + "base": "appliedenergistics2:part/cable/glass/pink" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json index dcc4c0bab..3cad93481 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/pink" + "base": "appliedenergistics2:part/cable/smart/pink" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json index 4c731e4e2..593a28c3f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/pink" + "base": "appliedenergistics2:part/cable/dense_smart/pink" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json index 2adec2465..b788d78e8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/purple" + "base": "appliedenergistics2:part/cable/covered/purple" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json index a4de5ea57..956cd8532 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/purple" + "base": "appliedenergistics2:part/cable/dense_covered/purple" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json index 540462b22..0a0bf4bbe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/purple" + "base": "appliedenergistics2:part/cable/glass/purple" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json index ace644f98..4abe8afcd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/purple" + "base": "appliedenergistics2:part/cable/smart/purple" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json index ba9b8d783..c54666538 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/purple" + "base": "appliedenergistics2:part/cable/dense_smart/purple" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json index 9623e2590..238d4c653 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "cable": "appliedenergistics2:parts/quartz_fiber" + "cable": "appliedenergistics2:part/quartz_fiber" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json index eeb2c24bf..d4355b45c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/red" + "base": "appliedenergistics2:part/cable/covered/red" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json index 0a6b7a2dd..4ea9a32fe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/red" + "base": "appliedenergistics2:part/cable/dense_covered/red" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json index 782ca948d..86b30b484 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/red" + "base": "appliedenergistics2:part/cable/glass/red" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json index 5b4698f91..49536d4c7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/red" + "base": "appliedenergistics2:part/cable/smart/red" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json index f631ab7c7..4ed48aeb9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/red" + "base": "appliedenergistics2:part/cable/dense_smart/red" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json index fc0c8d24b..321721108 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json @@ -1,10 +1,10 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/monitor_front", - "front_bright": "appliedenergistics2:parts/monitor_colored", - "front_medium_bright": "appliedenergistics2:parts/monitor_bright", - "front_medium": "appliedenergistics2:parts/monitor_colored", - "front_dark": "appliedenergistics2:parts/monitor_colored" + "front": "appliedenergistics2:part/monitor_front", + "front_bright": "appliedenergistics2:part/monitor_colored", + "front_medium_bright": "appliedenergistics2:part/monitor_bright", + "front_medium": "appliedenergistics2:part/monitor_colored", + "front_dark": "appliedenergistics2:part/monitor_colored" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json index 9739dc219..0f2174895 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "channelsOdd": "appliedenergistics2:parts/cable/smart/channels_00", - "channelsEven": "appliedenergistics2:parts/cable/smart/channels_10" + "channelsOdd": "appliedenergistics2:part/cable/smart/channels_00", + "channelsEven": "appliedenergistics2:part/cable/smart/channels_10" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json index 5b2843320..857b956f6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json @@ -1,7 +1,7 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "channels": "appliedenergistics2:parts/cable/dense_smart/0" + "channels": "appliedenergistics2:part/cable/dense_smart/0" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json index 88471b603..fa4785d8c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "sides": "appliedenergistics2:parts/storage_bus_sides", - "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:parts/storage_bus" + "sides": "appliedenergistics2:part/storage_bus_sides", + "back": "appliedenergistics2:part/storage_bus_back", + "front": "appliedenergistics2:part/storage_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json index 74b2b7174..cf7287765 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/storage_monitor", - "front_bright": "appliedenergistics2:parts/storage_monitor_bright", - "front_medium": "appliedenergistics2:parts/storage_monitor_medium", - "front_dark": "appliedenergistics2:parts/storage_monitor_dark" + "front": "appliedenergistics2:part/storage_monitor", + "front_bright": "appliedenergistics2:part/storage_monitor_bright", + "front_medium": "appliedenergistics2:part/storage_monitor_medium", + "front_dark": "appliedenergistics2:part/storage_monitor_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/terminal.json index 66d824b33..069bbb7d7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/terminal.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/terminal.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/display_base", "textures": { - "front": "appliedenergistics2:parts/terminal", - "front_bright": "appliedenergistics2:parts/terminal_bright", - "front_medium": "appliedenergistics2:parts/terminal_medium", - "front_dark": "appliedenergistics2:parts/terminal_dark" + "front": "appliedenergistics2:part/terminal", + "front_bright": "appliedenergistics2:part/terminal_bright", + "front_medium": "appliedenergistics2:part/terminal_medium", + "front_dark": "appliedenergistics2:part/terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json index 457b6c8d5..8072657ad 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json @@ -1,9 +1,9 @@ { "parent": "appliedenergistics2:item/part_base", "textures": { - "bus": "appliedenergistics2:parts/toggle_bus", - "status": "appliedenergistics2:parts/monitor_sides_status", - "lights": "appliedenergistics2:parts/monitor_sides_status_off" + "bus": "appliedenergistics2:part/toggle_bus", + "status": "appliedenergistics2:part/monitor_sides_status", + "lights": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json index 598993e4c..3e1283304 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/white" + "base": "appliedenergistics2:part/cable/covered/white" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json index b6763b3f8..bea71a822 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/white" + "base": "appliedenergistics2:part/cable/dense_covered/white" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json index 3c0067c04..e65686c30 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/white" + "base": "appliedenergistics2:part/cable/glass/white" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json index fa600d0ab..f03ed9ddd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/white" + "base": "appliedenergistics2:part/cable/smart/white" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json index 43d85d346..6bc3c2e82 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/white" + "base": "appliedenergistics2:part/cable/dense_smart/white" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json index 810cf5dc8..2a3b206b3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json @@ -3,10 +3,10 @@ "textures": { "particle": "appliedenergistics2:block/wireless_access_point_inside", "inside": "appliedenergistics2:block/wireless_access_point_inside", - "sides": "appliedenergistics2:parts/monitor_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", + "sides": "appliedenergistics2:part/monitor_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "torch": "appliedenergistics2:block/wireless_access_point", - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json index ecfebb488..ab59e208b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/covered/yellow" + "base": "appliedenergistics2:part/cable/covered/yellow" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json index ee10a60f4..0f80aedbc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/covered_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/yellow" + "base": "appliedenergistics2:part/cable/dense_covered/yellow" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json index b30df2413..df43981e7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/glass_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/glass/yellow" + "base": "appliedenergistics2:part/cable/glass/yellow" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json index eca2c84c2..9fffa73c0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/smart/yellow" + "base": "appliedenergistics2:part/cable/smart/yellow" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json index fd4d25e90..c2c3b4878 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:item/smart_dense_cable_base", "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/yellow" + "base": "appliedenergistics2:part/cable/dense_smart/yellow" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json index 617758979..3f7c7a24c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/annihilation_plane", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/annihilation_plane", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json index ae4365576..3a456f1fb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/annihilation_plane_on", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/annihilation_plane_on", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json index 0b21e11ea..3fa87e271 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/covered/${color}" + "base": "appliedenergistics2:part/cable/covered/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json index 4de548bb1..69d7c7c8b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/covered/${color}" + "base": "appliedenergistics2:part/cable/covered/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json index ec449e51a..e3f584833 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/covered/${color}" + "base": "appliedenergistics2:part/cable/covered/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json index c2de0b52c..6b642074b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/${color}" + "base": "appliedenergistics2:part/cable/dense_covered/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json index 3cee47219..6698e2ee0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/${color}" + "base": "appliedenergistics2:part/cable/dense_covered/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json index 270576f0b..1c445e661 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense_covered/${color}" + "base": "appliedenergistics2:part/cable/dense_covered/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json index 8cea214ad..ecc3e9455 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/${color}" + "base": "appliedenergistics2:part/cable/dense_smart/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json index b774bfb28..df53ac7c6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json @@ -1,7 +1,7 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/${color}", - "channels": "appliedenergistics2:parts/cable/dense_smart/${channels}" + "base": "appliedenergistics2:part/cable/dense_smart/${color}", + "channels": "appliedenergistics2:part/cable/dense_smart/${channels}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json index ba21522e7..64fb1de11 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json @@ -1,7 +1,7 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/dense_smart/${color}", - "channels": "appliedenergistics2:parts/cable/dense_smart/${channels}" + "base": "appliedenergistics2:part/cable/dense_smart/${color}", + "channels": "appliedenergistics2:part/cable/dense_smart/${channels}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json index 721b72118..e5757fc76 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/glass/transparent" + "base": "appliedenergistics2:part/cable/glass/transparent" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json index 4b0bc5b73..c2397cef2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/glass/transparent" + "base": "appliedenergistics2:part/cable/glass/transparent" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json index 2f1a3be13..60114e106 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/glass/transparent" + "base": "appliedenergistics2:part/cable/glass/transparent" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json index 0175823f9..510ad4158 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json @@ -1,6 +1,6 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/smart/${color}" + "base": "appliedenergistics2:part/cable/smart/${color}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json index f56b8ce45..e156cbb58 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json @@ -1,7 +1,7 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/smart/${color}", - "channels": "appliedenergistics2:parts/cable/smart/${channels}" + "base": "appliedenergistics2:part/cable/smart/${color}", + "channels": "appliedenergistics2:part/cable/smart/${channels}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json index bfb8ad55c..0ad2386d2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json @@ -1,7 +1,7 @@ { "textures": { - "base": "appliedenergistics2:parts/cable/smart/${color}", - "channels": "appliedenergistics2:parts/cable/smart/${channels}" + "base": "appliedenergistics2:part/cable/smart/${color}", + "channels": "appliedenergistics2:part/cable/smart/${channels}" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json index 8fa002a46..31ca4a09c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json @@ -1,7 +1,7 @@ { "textures": { - "0": "appliedenergistics2:parts/cable_anchor", - "particle": "appliedenergistics2:parts/cable_anchor" + "0": "appliedenergistics2:part/cable_anchor", + "particle": "appliedenergistics2:part/cable_anchor" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json index 4b9f989dd..ebcc39f43 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json @@ -1,7 +1,7 @@ { "textures": { - "0": "appliedenergistics2:parts/cable_anchor", - "particle": "appliedenergistics2:parts/cable_anchor" + "0": "appliedenergistics2:part/cable_anchor", + "particle": "appliedenergistics2:part/cable_anchor" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json index e5ac44882..426ac0d71 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json @@ -1,7 +1,7 @@ { "textures": { - "0": "appliedenergistics2:parts/cable_anchor", - "particle": "appliedenergistics2:parts/cable_anchor" + "0": "appliedenergistics2:part/cable_anchor", + "particle": "appliedenergistics2:part/cable_anchor" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json index e0166fa7c..d02f61521 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/conversion_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium_locked", - "lightsDark": "appliedenergistics2:parts/conversion_monitor_dark" + "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", + "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium_locked", + "lightsDark": "appliedenergistics2:part/conversion_monitor_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json index 3c91d21a7..dc374107a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/conversion_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium_locked", - "lightsDark": "appliedenergistics2:parts/conversion_monitor_dark" + "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", + "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium_locked", + "lightsDark": "appliedenergistics2:part/conversion_monitor_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json index 00cb8cb26..62aba40eb 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/conversion_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium", - "lightsDark": "appliedenergistics2:parts/conversion_monitor_dark" + "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", + "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium", + "lightsDark": "appliedenergistics2:part/conversion_monitor_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json index bc3035772..d606f38cf 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/conversion_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/conversion_monitor_medium", - "lightsDark": "appliedenergistics2:parts/conversion_monitor_dark" + "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", + "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium", + "lightsDark": "appliedenergistics2:part/conversion_monitor_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json index a2633d0a1..2c15cb29d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/crafting_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/crafting_terminal_medium", - "lightsDark": "appliedenergistics2:parts/crafting_terminal_dark" + "lightsBright": "appliedenergistics2:part/crafting_terminal_bright", + "lightsMedium": "appliedenergistics2:part/crafting_terminal_medium", + "lightsDark": "appliedenergistics2:part/crafting_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json index cf0aba25e..b3b37bf99 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/crafting_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/crafting_terminal_medium", - "lightsDark": "appliedenergistics2:parts/crafting_terminal_dark" + "lightsBright": "appliedenergistics2:part/crafting_terminal_bright", + "lightsMedium": "appliedenergistics2:part/crafting_terminal_medium", + "lightsDark": "appliedenergistics2:part/crafting_terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_base.json b/src/main/resources/assets/appliedenergistics2/models/part/display_base.json index 890d13172..1d3c4b67f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/monitor_front", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/monitor_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/monitor_front", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_off.json b/src/main/resources/assets/appliedenergistics2/models/part/display_off.json index 560d1a014..f075557fc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_off.json @@ -1,8 +1,8 @@ { "textures": { - "lightsBright": "appliedenergistics2:parts/terminal_bright", - "lightsMedium": "appliedenergistics2:parts/terminal_medium", - "lightsDark": "appliedenergistics2:parts/terminal_dark" + "lightsBright": "appliedenergistics2:part/terminal_bright", + "lightsMedium": "appliedenergistics2:part/terminal_medium", + "lightsDark": "appliedenergistics2:part/terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json index 02e6ea241..a3c08b8e5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json index f646c8639..da0bc56ca 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json index b88a57dfa..5ea6cdd15 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json index f82d6f026..c2f2de5f4 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/export_bus", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/export_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/export_bus", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json index a4a4940cf..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json index 3d5d7755e..26923fa90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json index 9bcf52c70..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json index 7ea7bbe1c..68c846a15 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/fluid_annihilation_plane", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/fluid_annihilation_plane", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json index 60f244818..1ec998f1f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/fluid_annihilation_plane_on", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/fluid_annihilation_plane_on", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json index 7a62df859..764d91141 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/fluid_export_bus", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/export_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/fluid_export_bus", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json index a4a4940cf..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json index 3d5d7755e..26923fa90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json index 9bcf52c70..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json index 1adaf10ed..377ade8c8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/fluid_formation_plane", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/fluid_formation_plane", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json index 73c1e511a..80088a7bd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/fluid_formation_plane_on", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/fluid_formation_plane_on", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json index 114a8f894..9f8b04961 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/import_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/fluid_import_bus", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/import_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/fluid_import_bus", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json index a4a4940cf..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json index 3d5d7755e..26923fa90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json index 9bcf52c70..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json index 93337bfdc..57799b8bd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/fluid_interface", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/export_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/fluid_interface", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json index e675a71e5..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json index 2707327cb..78dbaf3ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json index f78e58241..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json index aac09562e..2b89c80c9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/storage_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:parts/fluid_storage_bus", - "particle": "appliedenergistics2:parts/storage_bus_back" + "sides": "appliedenergistics2:part/storage_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/storage_bus_back", + "front": "appliedenergistics2:part/fluid_storage_bus", + "particle": "appliedenergistics2:part/storage_bus_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json index e675a71e5..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json index 2707327cb..78dbaf3ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json index f78e58241..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json index 90fed86b0..e9397f8c8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/fluid_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/fluid_terminal_medium", - "lightsDark": "appliedenergistics2:parts/fluid_terminal_dark" + "lightsBright": "appliedenergistics2:part/fluid_terminal_bright", + "lightsMedium": "appliedenergistics2:part/fluid_terminal_medium", + "lightsDark": "appliedenergistics2:part/fluid_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json index 4b3fcf81c..39624a853 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/fluid_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/fluid_terminal_medium", - "lightsDark": "appliedenergistics2:parts/fluid_terminal_dark" + "lightsBright": "appliedenergistics2:part/fluid_terminal_bright", + "lightsMedium": "appliedenergistics2:part/fluid_terminal_medium", + "lightsDark": "appliedenergistics2:part/fluid_terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json index 0b8e7e02d..ef6446f0a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/formation_plane", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/formation_plane", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json index 374473a3c..1ab09fe59 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/formation_plane_on", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/formation_plane_on", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json index e3560deb5..14edf75aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/identity_annihilation_plane", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/identity_annihilation_plane", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json index b5e12b76a..922c31938 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json @@ -1,6 +1,6 @@ { "loader": "appliedenergistics2:part_plane", - "front": "appliedenergistics2:parts/identity_annihilation_plane_on", - "sides": "appliedenergistics2:parts/plane_sides", - "back": "appliedenergistics2:parts/transition_plane_back" + "front": "appliedenergistics2:part/identity_annihilation_plane_on", + "sides": "appliedenergistics2:part/plane_sides", + "back": "appliedenergistics2:part/transition_plane_back" } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json index b3f35681f..c21a5ec85 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/import_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/import_bus", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/import_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/import_bus", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json index a4a4940cf..0f6fe350a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json index 3d5d7755e..26923fa90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json index 9bcf52c70..9444d89aa 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json index 7063505df..4abc4f5a9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/export_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/interface", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/export_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/interface", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json index e675a71e5..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json index 2707327cb..78dbaf3ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json index f78e58241..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json index 6d2759c95..bd8344e12 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/interface_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/interface_terminal_medium", - "lightsDark": "appliedenergistics2:parts/interface_terminal_dark" + "lightsBright": "appliedenergistics2:part/interface_terminal_bright", + "lightsMedium": "appliedenergistics2:part/interface_terminal_medium", + "lightsDark": "appliedenergistics2:part/interface_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json index 2fc010e8f..f88c8cec0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/interface_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/interface_terminal_medium", - "lightsDark": "appliedenergistics2:parts/interface_terminal_dark" + "lightsBright": "appliedenergistics2:part/interface_terminal_bright", + "lightsMedium": "appliedenergistics2:part/interface_terminal_medium", + "lightsDark": "appliedenergistics2:part/interface_terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json index eb0c23467..b795ef508 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json @@ -1,6 +1,6 @@ { "parent": "appliedenergistics2:part/toggle_bus_base", "textures": { - "bus": "appliedenergistics2:parts/inverted_toggle_bus" + "bus": "appliedenergistics2:part/inverted_toggle_bus" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json index 44a520360..db878c84a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json @@ -1,8 +1,8 @@ { "textures": { - "emitter": "appliedenergistics2:parts/level_emitter_off", - "sides": "appliedenergistics2:parts/monitor_sides", - "particle": "appliedenergistics2:parts/level_emitter_off" + "emitter": "appliedenergistics2:part/level_emitter_off", + "sides": "appliedenergistics2:part/monitor_sides", + "particle": "appliedenergistics2:part/level_emitter_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json index ffc981aef..3a8418500 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json @@ -2,8 +2,8 @@ "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { - "emitter": "appliedenergistics2:parts/level_emitter_on", - "particle": "appliedenergistics2:parts/level_emitter_on" + "emitter": "appliedenergistics2:part/level_emitter_on", + "particle": "appliedenergistics2:part/level_emitter_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json index 3ae5fcbde..459e7a6d8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json index 8dbef85bf..7a7b7bf67 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json index a11f5e9ba..edfc24671 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json index 00332badd..36412650d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json @@ -1,10 +1,10 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides", - "back": "appliedenergistics2:parts/monitor_back", - "front": "appliedenergistics2:parts/monitor_front", - "particle": "appliedenergistics2:parts/monitor_back" + "sides": "appliedenergistics2:part/monitor_sides", + "back": "appliedenergistics2:part/monitor_back", + "front": "appliedenergistics2:part/monitor_front", + "particle": "appliedenergistics2:part/monitor_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json index 5c6150adc..083589c2c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json @@ -1,6 +1,6 @@ { "textures": { - "lights": "appliedenergistics2:parts/monitor_light" + "lights": "appliedenergistics2:part/monitor_light" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json index e4a60712d..6686c7dc7 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json @@ -2,7 +2,7 @@ "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { - "lights": "appliedenergistics2:parts/monitor_light" + "lights": "appliedenergistics2:part/monitor_light" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json index efba08753..6e520b096 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json @@ -1,6 +1,6 @@ { "textures": { - "lights": "appliedenergistics2:parts/monitor_light" + "lights": "appliedenergistics2:part/monitor_light" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json index 9b13ae35b..361b7cd80 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lights": "appliedenergistics2:parts/monitor_light" + "lights": "appliedenergistics2:part/monitor_light" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json index ee0dbc764..5f017168f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json @@ -1,6 +1,6 @@ { "textures": { - "lights": "appliedenergistics2:parts/monitor_light" + "lights": "appliedenergistics2:part/monitor_light" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json index 9299113bc..f4477877a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lights": "appliedenergistics2:parts/monitor_light" + "lights": "appliedenergistics2:part/monitor_light" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json index 4c6372bcb..e289da2e9 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json @@ -1,10 +1,10 @@ { "textures": { - "front": "appliedenergistics2:parts/p2p_tunnel_front", - "sides": "appliedenergistics2:parts/p2p_tunnel_sides", - "back": "appliedenergistics2:parts/p2p_tunnel_back", - "particle": "appliedenergistics2:parts/p2p_tunnel_back", - "back2": "appliedenergistics2:parts/p2p_tunnel_back2" + "front": "appliedenergistics2:part/p2p_tunnel_front", + "sides": "appliedenergistics2:part/p2p_tunnel_sides", + "back": "appliedenergistics2:part/p2p_tunnel_back", + "particle": "appliedenergistics2:part/p2p_tunnel_back", + "back2": "appliedenergistics2:part/p2p_tunnel_back2" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json index c574b96ec..32f2e7f9d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json index fd2ec71ce..605e634ea 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json index 9edb3c078..745408f15 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json index da163ab14..ee3cbd3e5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/pattern_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/pattern_terminal_medium", - "lightsDark": "appliedenergistics2:parts/pattern_terminal_dark" + "lightsBright": "appliedenergistics2:part/pattern_terminal_bright", + "lightsMedium": "appliedenergistics2:part/pattern_terminal_medium", + "lightsDark": "appliedenergistics2:part/pattern_terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json index 24d4cb34d..773395bfe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/pattern_terminal_bright", - "lightsMedium": "appliedenergistics2:parts/pattern_terminal_medium", - "lightsDark": "appliedenergistics2:parts/pattern_terminal_dark" + "lightsBright": "appliedenergistics2:part/pattern_terminal_bright", + "lightsMedium": "appliedenergistics2:part/pattern_terminal_medium", + "lightsDark": "appliedenergistics2:part/pattern_terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json b/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json index 952d200ed..d79f64bc1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json @@ -1,7 +1,7 @@ { "textures": { - "fiber": "appliedenergistics2:parts/quartz_fiber", - "particle": "appliedenergistics2:parts/quartz_fiber" + "fiber": "appliedenergistics2:part/quartz_fiber", + "particle": "appliedenergistics2:part/quartz_fiber" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json index d07100af0..3754ffb00 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json @@ -1,10 +1,10 @@ { "textures": { - "sides": "appliedenergistics2:parts/storage_bus_sides", - "sidesStatus": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/storage_bus_back", - "front": "appliedenergistics2:parts/storage_bus", - "particle": "appliedenergistics2:parts/storage_bus_back" + "sides": "appliedenergistics2:part/storage_bus_sides", + "sidesStatus": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/storage_bus_back", + "front": "appliedenergistics2:part/storage_bus", + "particle": "appliedenergistics2:part/storage_bus_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json index e675a71e5..b87024a70 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json index 2707327cb..78dbaf3ff 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json index f78e58241..88c28f857 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json index 1f3d86f35..95e8b7592 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/storage_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/storage_monitor_medium", - "lightsDark": "appliedenergistics2:parts/storage_monitor_dark_locked" + "lightsBright": "appliedenergistics2:part/storage_monitor_bright", + "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", + "lightsDark": "appliedenergistics2:part/storage_monitor_dark_locked" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json index a67875163..2512544c5 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/storage_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/storage_monitor_medium", - "lightsDark": "appliedenergistics2:parts/storage_monitor_dark_locked" + "lightsBright": "appliedenergistics2:part/storage_monitor_bright", + "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", + "lightsDark": "appliedenergistics2:part/storage_monitor_dark_locked" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json index 7d0943896..5a495de90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/storage_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/storage_monitor_medium", - "lightsDark": "appliedenergistics2:parts/storage_monitor_dark" + "lightsBright": "appliedenergistics2:part/storage_monitor_bright", + "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", + "lightsDark": "appliedenergistics2:part/storage_monitor_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json index 59106c724..994f39b27 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/storage_monitor_bright", - "lightsMedium": "appliedenergistics2:parts/storage_monitor_medium", - "lightsDark": "appliedenergistics2:parts/storage_monitor_dark" + "lightsBright": "appliedenergistics2:part/storage_monitor_bright", + "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", + "lightsDark": "appliedenergistics2:part/storage_monitor_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json index 1ef4fa66d..79130ef05 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json @@ -1,8 +1,8 @@ { "parent": "appliedenergistics2:part/display_off", "textures": { - "lightsBright": "appliedenergistics2:parts/terminal_bright", - "lightsMedium": "appliedenergistics2:parts/terminal_medium", - "lightsDark": "appliedenergistics2:parts/terminal_dark" + "lightsBright": "appliedenergistics2:part/terminal_bright", + "lightsMedium": "appliedenergistics2:part/terminal_medium", + "lightsDark": "appliedenergistics2:part/terminal_dark" } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json index a532eba26..61f131c5b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "lightsBright": "appliedenergistics2:parts/terminal_bright", - "lightsMedium": "appliedenergistics2:parts/terminal_medium", - "lightsDark": "appliedenergistics2:parts/terminal_dark" + "lightsBright": "appliedenergistics2:part/terminal_bright", + "lightsMedium": "appliedenergistics2:part/terminal_medium", + "lightsDark": "appliedenergistics2:part/terminal_dark" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json index 92d8a0f61..7ebb3a404 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json @@ -1,8 +1,8 @@ { "textures": { - "bus": "appliedenergistics2:parts/toggle_bus", - "sides": "appliedenergistics2:parts/monitor_sides_status", - "particle": "appliedenergistics2:parts/toggle_bus" + "bus": "appliedenergistics2:part/toggle_bus", + "sides": "appliedenergistics2:part/monitor_sides_status", + "particle": "appliedenergistics2:part/toggle_bus" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json index 6cf383ca7..9f2640024 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json index 9ca804fef..feda9bb06 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json @@ -1,6 +1,6 @@ { "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_off" + "indicator": "appliedenergistics2:part/monitor_sides_status_off" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json index f8ebdacfe..444e5f7fe 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json @@ -1,7 +1,7 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "indicator": "appliedenergistics2:parts/monitor_sides_status_on" + "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json index 7453fa56a..412232729 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json @@ -1,9 +1,9 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/transition_plane_back", - "indicator": "appliedenergistics2:parts/monitor_sides_status_has_channel" + "sides": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/transition_plane_back", + "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json index e577e56ef..25df38911 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json @@ -1,9 +1,9 @@ { "textures": { - "sides": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/transition_plane_back", - "indicator": "appliedenergistics2:parts/monitor_sides_status_off", - "particle": "appliedenergistics2:parts/transition_plane_back" + "sides": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/transition_plane_back", + "indicator": "appliedenergistics2:part/monitor_sides_status_off", + "particle": "appliedenergistics2:part/transition_plane_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json index 83a63f305..22d22c288 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json @@ -1,10 +1,10 @@ { "loader": "appliedenergistics2:uvlightmap", "textures": { - "sides": "appliedenergistics2:parts/monitor_sides_status", - "back": "appliedenergistics2:parts/transition_plane_back", - "indicator": "appliedenergistics2:parts/monitor_sides_status_on", - "particle": "appliedenergistics2:parts/transition_plane_back" + "sides": "appliedenergistics2:part/monitor_sides_status", + "back": "appliedenergistics2:part/transition_plane_back", + "indicator": "appliedenergistics2:part/monitor_sides_status_on", + "particle": "appliedenergistics2:part/transition_plane_back" }, "elements": [ { diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/part/annihilation_plane_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/covered/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/dense_smart/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/core/glass/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/covered/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_covered/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/0.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/0.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/1.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/1.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/10.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/10.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/11.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/11.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/12.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/12.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/13.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/13.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/14.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/14.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/15.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/15.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/16.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/16.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/17.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/17.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/18.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/18.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/19.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/19.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/20.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/20.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/21.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/21.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/22.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/22.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/23.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/23.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/24.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/24.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/25.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/25.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/26.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/26.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/27.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/27.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/28.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/28.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/29.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/29.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/3.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/3.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/30.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/30.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/31.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/31.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/32.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/32.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/4.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/4.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/5.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/5.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/6.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/6.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/7.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/7.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/8.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/8.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/9.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/9.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/dense_smart/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/glass/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/black.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/black.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/black.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/brown.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/brown.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_00.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_00.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_00.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_00.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_01.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_01.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_01.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_01.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_02.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_02.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_02.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_02.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_03.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_03.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_03.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_03.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_04.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_04.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_04.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_04.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_10.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_10.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_10.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_10.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_11.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_11.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_11.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_11.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_12.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_12.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_12.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_12.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_13.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_13.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_13.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_13.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_14.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_14.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_14.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/channels_14.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/cyan.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/cyan.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/green.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/green.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/green.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/light_blue.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/light_blue.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/light_gray.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/light_gray.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/lime.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/lime.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/magenta.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/magenta.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/orange.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/orange.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/pink.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/pink.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/purple.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/purple.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/red.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/red.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/red.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/transparent.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/transparent.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/white.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/white.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/white.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/yellow.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable/smart/yellow.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/cable_anchor.png b/src/main/resources/assets/appliedenergistics2/textures/part/cable_anchor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/cable_anchor.png rename to src/main/resources/assets/appliedenergistics2/textures/part/cable_anchor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium_locked.png b/src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_medium_locked.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium_locked.png rename to src/main/resources/assets/appliedenergistics2/textures/part/conversion_monitor_medium_locked.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/crafting_terminal_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/export_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_annihilation_plane_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_export_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_formation_plane_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_import_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_interface.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_storage_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/fluid_terminal_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/part/formation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/part/formation_plane_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/part/identity_annihilation_plane_on.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/import_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus_sides.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/part/import_bus_sides.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/interface.png rename to src/main/resources/assets/appliedenergistics2/textures/part/interface.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/interface_terminal_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/inverted_toggle_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/inverted_toggle_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/inverted_toggle_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/inverted_toggle_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_off.png b/src/main/resources/assets/appliedenergistics2/textures/part/level_emitter_off.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_off.png rename to src/main/resources/assets/appliedenergistics2/textures/part/level_emitter_off.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/level_emitter_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/level_emitter_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_back.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_back.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_colored.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_colored.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_colored.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_colored.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_front.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_front.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_light.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_light.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_light.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_light.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_has_channel.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status_has_channel.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_has_channel.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status_has_channel.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_off.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status_off.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_off.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status_off.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_on.png b/src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status_on.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_on.png rename to src/main/resources/assets/appliedenergistics2/textures/part/monitor_sides_status_on.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back.png rename to src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back2.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back2.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_back2.png rename to src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_back2.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_frequency.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_frequency.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_frequency.png rename to src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_frequency.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_front.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_front.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_front.png rename to src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_front.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_sides.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/part/p2p_tunnel_sides.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/pattern_terminal_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/plane_sides.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/part/plane_sides.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/quartz_fiber.png b/src/main/resources/assets/appliedenergistics2/textures/part/quartz_fiber.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/quartz_fiber.png rename to src/main/resources/assets/appliedenergistics2/textures/part/quartz_fiber.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_back.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_back.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_sides.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_bus_sides.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark_locked.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_dark_locked.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark_locked.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_dark_locked.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/storage_monitor_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/terminal.png b/src/main/resources/assets/appliedenergistics2/textures/part/terminal.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/part/terminal.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/part/terminal_bright.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/part/terminal_bright.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/part/terminal_dark.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/part/terminal_dark.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/part/terminal_medium.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/part/terminal_medium.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/toggle_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/toggle_bus.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/toggle_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/part/toggle_bus.png diff --git a/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png b/src/main/resources/assets/appliedenergistics2/textures/part/transition_plane_back.png similarity index 100% rename from src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png rename to src/main/resources/assets/appliedenergistics2/textures/part/transition_plane_back.png From 8a20d3c1d75c77cc89a3078fe05296c45bdd37cb Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 15:00:46 +0200 Subject: [PATCH 11/19] Consolidated fluid models to reuse the item counterparts with different textures. --- .../models/item/cable_fluid_interface.json | 78 +------------- .../models/item/fluid_annihilation_plane.json | 53 +--------- .../models/item/fluid_export_bus.json | 78 +------------- .../models/item/fluid_import_bus.json | 78 +------------- .../models/item/fluid_level_emitter.json | 19 +--- .../models/item/fluid_storage_bus.json | 78 +------------- .../models/part/fluid_export_bus_base.json | 100 +----------------- .../models/part/fluid_import_bus_base.json | 98 +---------------- .../models/part/fluid_interface_base.json | 74 +------------ .../models/part/fluid_storage_bus_base.json | 92 +--------------- 10 files changed, 20 insertions(+), 728 deletions(-) diff --git a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json index 7d834414b..262546da6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/cable_interface", "textures": { "sides": "appliedenergistics2:part/monitor_sides", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_interface" - }, - "elements": [ - { - "from": [2, 2, 7], - "to": [14, 14, 9], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 10], - "to": [11, 11, 11], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 9], - "to": [11, 11, 10], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json index 1cc1eb6bb..63c56197d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json @@ -1,56 +1,7 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/annihilation_plane", "textures": { "sides": "appliedenergistics2:part/plane_sides", "plane": "appliedenergistics2:part/fluid_annihilation_plane" - }, - "elements": [ - { - "name": "Front", - "from": [1, 1, 8], - "to": [15, 15, 9], - "faces": { - "north": { - "texture": "plane" - }, - "south": { - "texture": "sides" - }, - "east": { - "texture": "sides" - }, - "west": { - "texture": "sides" - }, - "up": { - "texture": "sides" - }, - "down": { - "texture": "sides" - } - } - }, - { - "name": "Back", - "from": [5, 5, 9], - "to": [11, 11, 10], - "faces": { - "east": { - "texture": "sides" - }, - "south": { - "texture": "sides" - }, - "west": { - "texture": "sides" - }, - "up": { - "texture": "sides" - }, - "down": { - "texture": "sides" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json index 107d8242f..3257ae766 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/export_bus", "textures": { "sides": "appliedenergistics2:part/export_bus_sides", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_export_bus" - }, - "elements": [ - { - "from": [4, 4, 8], - "to": [12, 12, 10], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 7], - "to": [11, 11, 8], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 6], - "to": [10, 10, 7], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json index 9ed0a9c9e..cb2e2ffdc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/import_bus", "textures": { "sides": "appliedenergistics2:part/import_bus_sides", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_import_bus" - }, - "elements": [ - { - "from": [3, 3, 8], - "to": [13, 13, 9], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [4, 4, 9], - "to": [12, 12, 10], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 10], - "to": [11, 11, 11], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json index 3e85e7147..9347ceeee 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json @@ -1,20 +1,3 @@ { - "parent": "appliedenergistics2:item/part_base", - "textures": { - "emitter": "appliedenergistics2:part/level_emitter_off" - }, - "elements": [ - { - "from": [7, 6, 7], - "to": [9, 10, 9], - "faces": { - "north": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "east": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "south": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "west": { "uv": [6, 7, 10, 9], "rotation": 90, "texture": "#emitter" }, - "up": { "uv": [6, 7, 8, 9], "texture": "#emitter" }, - "down": { "uv": [8, 7, 10, 9], "texture": "#emitter" } - } - } - ] + "parent": "appliedenergistics2:item/level_emitter" } diff --git a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json index e6fa64fb6..83b33b90e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json @@ -1,82 +1,8 @@ { - "parent": "appliedenergistics2:item/part_base", + "parent": "appliedenergistics2:item/storage_bus", "textures": { "sides": "appliedenergistics2:part/storage_bus_sides", "back": "appliedenergistics2:part/storage_bus_back", "front": "appliedenergistics2:part/fluid_storage_bus" - }, - "elements": [ - { - "from": [3, 3, 6], - "to": [13, 13, 7], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [2, 2, 7], - "to": [14, 14, 8], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 8], - "to": [11, 11, 10], - "faces": { - "north": { - "texture": "#front" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "down": { - "texture": "#sides" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json index 764d91141..d35b0c854 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json @@ -1,104 +1,10 @@ { + "parent": "appliedenergistics2:part/export_bus_base", "textures": { "sides": "appliedenergistics2:part/export_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_export_bus", "particle": "appliedenergistics2:part/monitor_back" - }, - "elements": [ - { - "from": [4, 4, 2], - "to": [12, 12, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 1], - "to": [11, 11, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 0], - "to": [10, 10, 1], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 4], - "to": [10, 10, 5], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] -} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json index 9f8b04961..6e0969905 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json @@ -1,104 +1,10 @@ { + "parent": "appliedenergistics2:part/import_bus_base", "textures": { "sides": "appliedenergistics2:part/import_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_import_bus", "particle": "appliedenergistics2:part/monitor_back" - }, - "elements": [ - { - "from": [4, 4, 0], - "to": [12, 12, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 2], - "to": [11, 11, 3], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 3], - "to": [10, 10, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [6, 6, 4], - "to": [10, 10, 5], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json index 57799b8bd..f57a20199 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json @@ -1,80 +1,10 @@ { + "parent": "appliedenergistics2:part/interface_base", "textures": { "sides": "appliedenergistics2:part/export_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/monitor_back", "front": "appliedenergistics2:part/fluid_interface", "particle": "appliedenergistics2:part/monitor_back" - }, - "elements": [ - { - "from": [2, 2, 0], - "to": [14, 14, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 3], - "to": [11, 11, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 2], - "to": [11, 11, 3], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] + } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json index 2b89c80c9..63e0a103f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json @@ -1,98 +1,10 @@ { + "parent": "appliedenergistics2:part/storage_bus_base", "textures": { "sides": "appliedenergistics2:part/storage_bus_sides", "sidesStatus": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/storage_bus_back", "front": "appliedenergistics2:part/fluid_storage_bus", "particle": "appliedenergistics2:part/storage_bus_back" - }, - "elements": [ - { - "from": [3, 3, 0], - "to": [13, 13, 1], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [2, 2, 1], - "to": [14, 14, 2], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 3], - "to": [11, 11, 4], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [5, 5, 2], - "to": [11, 11, 3], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "east": { - "texture": "#sides" - }, - "west": { - "texture": "#sides" - } - } - } - ] + } } From e52cc40dbf70ee11b4cc1c7c96bbd9c180ccfe15 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 16:00:01 +0200 Subject: [PATCH 12/19] JSON Formatting Fix --- .../appliedenergistics2/models/part/fluid_export_bus_base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json index d35b0c854..93cc27a89 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json @@ -7,4 +7,4 @@ "front": "appliedenergistics2:part/fluid_export_bus", "particle": "appliedenergistics2:part/monitor_back" } -} \ No newline at end of file +} From b45669bb824a4b8bf66a2b5b0bf0254a1f8d9887 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 15:49:01 +0200 Subject: [PATCH 13/19] Removed several unchecked casts. --- .../java/appeng/me/cluster/IAECluster.java | 2 +- .../CraftingCPUCalculator.java | 2 +- .../implementations/CraftingCPUCluster.java | 4 +- .../implementations/QuantumCluster.java | 3 +- .../implementations/SpatialPylonCluster.java | 5 +-- .../me/helpers/AENetworkProxyMultiblock.java | 3 +- .../tile/crafting/CraftingTileEntity.java | 37 +++++++++---------- .../util/iterators/ProxyNodeIterator.java | 4 +- 8 files changed, 27 insertions(+), 33 deletions(-) diff --git a/src/main/java/appeng/me/cluster/IAECluster.java b/src/main/java/appeng/me/cluster/IAECluster.java index 4cb34f05c..adbe00f7c 100644 --- a/src/main/java/appeng/me/cluster/IAECluster.java +++ b/src/main/java/appeng/me/cluster/IAECluster.java @@ -47,5 +47,5 @@ public interface IAECluster { */ boolean isDestroyed(); - Iterator getTiles(); + Iterator getTiles(); } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java index 2a81b4cdf..2209ae317 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java @@ -90,7 +90,7 @@ public class CraftingCPUCalculator extends MBCalculator i = c.getTiles(); + final Iterator i = c.getTiles(); while (i.hasNext()) { final IGridHost gh = i.next(); final IGridNode n = gh.getGridNode(AEPartLocation.INTERNAL); diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 97c93c8fb..00b404b19 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -185,8 +185,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } @Override - public Iterator getTiles() { - return (Iterator) this.tiles.iterator(); + public Iterator getTiles() { + return this.tiles.iterator(); } void addTile(final CraftingTileEntity te) { diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 6b4f5ea9d..7ab580d98 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -33,7 +33,6 @@ import appeng.api.events.LocatableEventAnnounce; import appeng.api.events.LocatableEventAnnounce.LocatableEvent; import appeng.api.exceptions.FailedConnectionException; import appeng.api.features.ILocatable; -import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; import appeng.core.AELog; @@ -238,7 +237,7 @@ public class QuantumCluster implements ILocatable, IAECluster { } @Override - public Iterator getTiles() { + public Iterator getTiles() { return new ChainedIterator<>(this.getRing()[0], this.getRing()[1], this.getRing()[2], this.getRing()[3], this.getRing()[4], this.getRing()[5], this.getRing()[6], this.getRing()[7], this.center); } diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 2d3ef3ee4..a0c4b3671 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -25,7 +25,6 @@ import java.util.List; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import appeng.api.networking.IGridHost; import appeng.me.cluster.IAECluster; import appeng.me.cluster.MBCalculator; import appeng.tile.spatial.SpatialPylonTileEntity; @@ -88,8 +87,8 @@ public class SpatialPylonCluster implements IAECluster { } @Override - public Iterator getTiles() { - return (Iterator) this.getLine().iterator(); + public Iterator getTiles() { + return this.getLine().iterator(); } public int tileCount() { diff --git a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java index 9742d1f2c..6cd4ac64c 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java @@ -41,11 +41,10 @@ public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMul if (this.getCluster() == null) { return new ChainedIterator<>(); } - return new ProxyNodeIterator(this.getCluster().getTiles()); } private IAECluster getCluster() { - return ((IAEMultiBlock) this.getMachine()).getCluster(); + return ((IAEMultiBlock) this.getMachine()).getCluster(); } } diff --git a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java index b9d3685ec..fd117431c 100644 --- a/src/main/java/appeng/tile/crafting/CraftingTileEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingTileEntity.java @@ -18,14 +18,17 @@ package appeng.tile.crafting; -import java.util.*; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Optional; import javax.annotation.Nonnull; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; @@ -35,15 +38,12 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.api.config.Actionable; import appeng.api.implementations.IPowerChannelState; import appeng.api.networking.GridFlags; -import appeng.api.networking.IGridHost; import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.storage.IMEInventory; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.api.util.AEPartLocation; -import appeng.api.util.WorldCoord; import appeng.block.crafting.AbstractCraftingUnitBlock; import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; import appeng.core.Api; @@ -90,7 +90,7 @@ public class CraftingTileEntity extends AENetworkTileEntity @Override public boolean canBeRotated() { return true;// return BlockCraftingUnit.checkType( world.getBlockMetadata( xCoord, yCoord, - // zCoord ), + // zCoord ), // BlockCraftingUnit.BASE_MONITOR ); } @@ -250,21 +250,18 @@ public class CraftingTileEntity extends AENetworkTileEntity this.cluster.cancel(); final IMEInventory inv = this.cluster.getInventory(); - final LinkedList places = new LinkedList<>(); + final LinkedList places = new LinkedList<>(); - final Iterator i = this.cluster.getTiles(); + final Iterator i = this.cluster.getTiles(); while (i.hasNext()) { - final IGridHost h = i.next(); + final CraftingTileEntity h = i.next(); if (h == this) { - places.add(new WorldCoord(this)); + places.add(pos); } else { - final TileEntity te = (TileEntity) h; - - for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) { - final WorldCoord wc = new WorldCoord(te); - wc.add(d, 1); - if (this.world.isAirBlock(wc.getPos())) { - places.add(wc); + for (Direction d : Direction.values()) { + BlockPos p = h.pos.offset(d); + if (this.world.isAirBlock(p)) { + places.add(p); } } } @@ -288,10 +285,10 @@ public class CraftingTileEntity extends AENetworkTileEntity break; } - final WorldCoord wc = places.poll(); - places.add(wc); + final BlockPos pos = places.poll(); + places.add(pos); - Platform.spawnDrops(this.world, wc.getPos(), Collections.singletonList(g.createItemStack())); + Platform.spawnDrops(this.world, pos, Collections.singletonList(g.createItemStack())); } } diff --git a/src/main/java/appeng/util/iterators/ProxyNodeIterator.java b/src/main/java/appeng/util/iterators/ProxyNodeIterator.java index a9152fc70..b2da7085b 100644 --- a/src/main/java/appeng/util/iterators/ProxyNodeIterator.java +++ b/src/main/java/appeng/util/iterators/ProxyNodeIterator.java @@ -25,9 +25,9 @@ import appeng.api.networking.IGridNode; import appeng.api.util.AEPartLocation; public final class ProxyNodeIterator implements Iterator { - private final Iterator hosts; + private final Iterator hosts; - public ProxyNodeIterator(final Iterator hosts) { + public ProxyNodeIterator(final Iterator hosts) { this.hosts = hosts; } From 1c88ea7b78c38addd5ea7b69fd9fbd32f3165030 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 16:39:37 +0200 Subject: [PATCH 14/19] Fail faster when something modifies the list of energy providers/requesters while an extract/inject operation is ongoing, since this would lead to ConcurrentModificationExceptions later, without a way of tracking down what caused the modification in the first place. --- .../java/appeng/me/cache/EnergyGridCache.java | 86 +++++++++++++++---- 1 file changed, 68 insertions(+), 18 deletions(-) diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index db92ac10a..9a2ce7e64 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -29,6 +29,7 @@ import java.util.Queue; import java.util.Set; import java.util.SortedSet; +import com.google.common.base.Preconditions; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; import com.google.common.collect.Sets; @@ -84,8 +85,23 @@ public class EnergyGridCache implements IEnergyGrid { private final NavigableSet interests = Sets.newTreeSet(); private final double averageLength = 40.0; + + // Should only be modified from the add/remove methods below to guard against + // concurrent modifications private final SortedSet providers = new ObjectRBTreeSet<>(COMPARATOR_HIGHEST_PRIORITY_FIRST); + // Used to track whether an extraction is currently in progress, to fail fast + // when something externally + // modifies the energy grid. + private boolean ongoingExtractOperation = false; + + // Should only be modified from the add/remove methods below to guard against + // concurrent modifications private final SortedSet requesters = new ObjectRBTreeSet<>(COMPARATOR_LOWEST_PRIORITY_FIRST); + // Used to track whether an injection is currently in progress, to fail fast + // when something externally + // modifies the energy grid. + private boolean ongoingInjectOperation = false; + private final Multiset energyGridProviders = HashMultiset.create(); private final IGrid myGrid; private final HashMap watchers = new HashMap<>(); @@ -148,12 +164,12 @@ public class EnergyGridCache implements IEnergyGrid { switch (ev.type) { case PROVIDE_POWER: if (ev.storage.getPowerFlow() != AccessRestriction.WRITE) { - this.providers.add(ev.storage); + addProvider(ev.storage); } break; case REQUEST_POWER: if (ev.storage.getPowerFlow() != AccessRestriction.READ) { - this.requesters.add(ev.storage); + addRequester(ev.storage); } break; } @@ -281,16 +297,21 @@ public class EnergyGridCache implements IEnergyGrid { final Iterator it = this.providers.iterator(); - while (extractedPower < amt && it.hasNext()) { - final IAEPowerStorage node = it.next(); + ongoingExtractOperation = true; + try { + while (extractedPower < amt && it.hasNext()) { + final IAEPowerStorage node = it.next(); - final double req = amt - extractedPower; - final double newPower = node.extractAEPower(req, mode, PowerMultiplier.ONE); - extractedPower += newPower; + final double req = amt - extractedPower; + final double newPower = node.extractAEPower(req, mode, PowerMultiplier.ONE); + extractedPower += newPower; - if (newPower < req && mode == Actionable.MODULATE) { - it.remove(); + if (newPower < req && mode == Actionable.MODULATE) { + it.remove(); + } } + } finally { + ongoingExtractOperation = false; } final double result = Math.min(extractedPower, amt); @@ -313,13 +334,18 @@ public class EnergyGridCache implements IEnergyGrid { final Iterator it = this.requesters.iterator(); - while (amt > 0 && it.hasNext()) { - final IAEPowerStorage node = it.next(); - amt = node.injectAEPower(amt, mode); + ongoingInjectOperation = true; + try { + while (amt > 0 && it.hasNext()) { + final IAEPowerStorage node = it.next(); + amt = node.injectAEPower(amt, mode); - if (amt > 0 && mode == Actionable.MODULATE) { - it.remove(); + if (amt > 0 && mode == Actionable.MODULATE) { + it.remove(); + } } + } finally { + ongoingInjectOperation = false; } final double overflow = Math.max(0.0, amt); @@ -452,8 +478,8 @@ public class EnergyGridCache implements IEnergyGrid { this.globalAvailablePower -= ps.getAECurrentPower(); } - this.providers.remove(ps); - this.requesters.remove(ps); + removeProvider(ps); + removeRequester(ps); } } @@ -467,6 +493,30 @@ public class EnergyGridCache implements IEnergyGrid { } } + private void addRequester(IAEPowerStorage requester) { + Preconditions.checkState(!ongoingInjectOperation, + "Cannot modify energy requesters while energy is being injected."); + this.requesters.add(requester); + } + + private void removeRequester(IAEPowerStorage requester) { + Preconditions.checkState(!ongoingInjectOperation, + "Cannot modify energy requesters while energy is being injected."); + this.requesters.add(requester); + } + + private void addProvider(IAEPowerStorage provider) { + Preconditions.checkState(!ongoingExtractOperation, + "Cannot modify energy providers while energy is being extracted."); + this.providers.add(provider); + } + + private void removeProvider(IAEPowerStorage provider) { + Preconditions.checkState(!ongoingExtractOperation, + "Cannot modify energy providers while energy is being extracted."); + this.providers.remove(provider); + } + @Override public void addNode(final IGridNode node, final IGridHost machine) { if (machine instanceof IEnergyGridProvider) { @@ -492,11 +542,11 @@ public class EnergyGridCache implements IEnergyGrid { if (current > 0 && ps.getPowerFlow() != AccessRestriction.WRITE) { this.globalAvailablePower += current; - this.providers.add(ps); + addProvider(ps); } if (current < max && ps.getPowerFlow() != AccessRestriction.READ) { - this.requesters.add(ps); + addRequester(ps); } } } From 6187e6a7bb267a58e5a67420aad120cd6bc9c5b5 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 19 Jul 2020 20:04:08 +0200 Subject: [PATCH 15/19] Started refactoring number entry dialogs to use shared code. --- .../implementations/CraftAmountScreen.java | 4 +- .../implementations/LevelEmitterScreen.java | 128 ++---------------- .../implementations/NumberEntryWidget.java | 111 +++++++++++++++ .../gui/implementations/PriorityScreen.java | 2 +- .../appeng/client/gui/widgets/NumberBox.java | 77 +++++++++-- .../LevelEmitterContainer.java | 10 +- .../client/gui/FluidLevelEmitterScreen.java | 2 +- 7 files changed, 200 insertions(+), 134 deletions(-) create mode 100644 src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java index 629b7ac80..0dde00f28 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java @@ -69,7 +69,7 @@ public class CraftAmountScreen extends AEBaseScreen { subGui.addBackButton(this::addButton, 154, 0); this.amountToCraft = new NumberBox(this.font, this.guiLeft + 62, this.guiTop + 57, 59, this.font.FONT_HEIGHT, - Integer.class); + Integer.class, value -> {}); this.amountToCraft.setEnableBackgroundDrawing(false); this.amountToCraft.setMaxStringLength(16); this.amountToCraft.setTextColor(0xFFFFFF); @@ -80,7 +80,7 @@ public class CraftAmountScreen extends AEBaseScreen { private void confirm(Button button) { NetworkHandler.instance() - .sendToServer(new CraftRequestPacket(Integer.parseInt(this.amountToCraft.getText()), hasShiftDown())); + .sendToServer(new CraftRequestPacket((int) this.amountToCraft.getValue(), hasShiftDown())); } @Override diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java index 78954efce..aa37aac34 100644 --- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java +++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java @@ -18,8 +18,6 @@ package appeng.client.gui.implementations; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; @@ -29,28 +27,16 @@ import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.config.YesNo; -import appeng.client.gui.widgets.NumberBox; import appeng.client.gui.widgets.ServerSettingToggleButton; import appeng.client.gui.widgets.SettingToggleButton; import appeng.container.implementations.LevelEmitterContainer; -import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; public class LevelEmitterScreen extends UpgradeableScreen { - private NumberBox level; - - private Button plus1; - private Button plus10; - private Button plus100; - private Button plus1000; - private Button minus1; - private Button minus10; - private Button minus100; - private Button minus1000; - + private NumberEntryWidget level; private SettingToggleButton levelMode; private SettingToggleButton craftingMode; @@ -62,16 +48,15 @@ public class LevelEmitterScreen extends UpgradeableScreen public void init() { super.init(); - this.level = new NumberBox(this.font, this.guiLeft + 24, this.guiTop + 43, 79, this.font.FONT_HEIGHT, - Long.class); - this.level.setEnableBackgroundDrawing(false); - this.level.setMaxStringLength(16); - this.level.setTextColor(0xFFFFFF); - this.level.setVisible(true); - this.level.setFocused2(true); + this.level = new NumberEntryWidget(this, 20, 17, 79, this::onLevelChange); + this.level.addButtons(children::add, this::addButton); container.setTextField(this.level); } + private void onLevelChange(long level) { + NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", String.valueOf(level))); + } + @Override protected void addButtons() { this.levelMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 8, Settings.LEVEL_TYPE, @@ -82,29 +67,6 @@ public class LevelEmitterScreen extends UpgradeableScreen FuzzyMode.IGNORE_ALL); this.craftingMode = new ServerSettingToggleButton<>(this.guiLeft - 18, this.guiTop + 48, Settings.CRAFT_VIA_REDSTONE, YesNo.NO); - - final int a = AEConfig.instance().levelByStackAmounts(0); - final int b = AEConfig.instance().levelByStackAmounts(1); - final int c = AEConfig.instance().levelByStackAmounts(2); - final int d = AEConfig.instance().levelByStackAmounts(3); - - this.addButton(this.plus1 = new Button(this.guiLeft + 20, this.guiTop + 17, 22, 20, "+" + a, btn -> addQty(a))); - this.addButton( - this.plus10 = new Button(this.guiLeft + 48, this.guiTop + 17, 28, 20, "+" + b, btn -> addQty(b))); - this.addButton( - this.plus100 = new Button(this.guiLeft + 82, this.guiTop + 17, 32, 20, "+" + c, btn -> addQty(c))); - this.addButton( - this.plus1000 = new Button(this.guiLeft + 120, this.guiTop + 17, 38, 20, "+" + d, btn -> addQty(d))); - - this.addButton( - this.minus1 = new Button(this.guiLeft + 20, this.guiTop + 59, 22, 20, "-" + a, btn -> addQty(-a))); - this.addButton( - this.minus10 = new Button(this.guiLeft + 48, this.guiTop + 59, 28, 20, "-" + b, btn -> addQty(-b))); - this.addButton( - this.minus100 = new Button(this.guiLeft + 82, this.guiTop + 59, 32, 20, "-" + c, btn -> addQty(-c))); - this.addButton( - this.minus1000 = new Button(this.guiLeft + 120, this.guiTop + 59, 38, 20, "-" + d, btn -> addQty(-d))); - this.addButton(this.levelMode); this.addButton(this.redstoneMode); this.addButton(this.craftingMode); @@ -115,15 +77,7 @@ public class LevelEmitterScreen extends UpgradeableScreen final boolean notCraftingMode = this.bc.getInstalledUpgrades(Upgrades.CRAFTING) == 0; // configure enabled status... - this.level.setEnabled(notCraftingMode); - this.plus1.active = notCraftingMode; - this.plus10.active = notCraftingMode; - this.plus100.active = notCraftingMode; - this.plus1000.active = notCraftingMode; - this.minus1.active = notCraftingMode; - this.minus10.active = notCraftingMode; - this.minus100.active = notCraftingMode; - this.minus1000.active = notCraftingMode; + this.level.setActive(notCraftingMode); this.levelMode.active = notCraftingMode; this.redstoneMode.active = notCraftingMode; @@ -160,70 +114,14 @@ public class LevelEmitterScreen extends UpgradeableScreen return GuiText.LevelEmitter; } - private void addQty(final long i) { - try { - String Out = this.level.getText(); - - boolean Fixed = false; - while (Out.startsWith("0") && Out.length() > 1) { - Out = Out.substring(1); - Fixed = true; - } - - if (Fixed) { - this.level.setText(Out); - } - - if (Out.isEmpty()) { - Out = "0"; - } - - long result = Long.parseLong(Out); - result += i; - if (result < 0) { - result = 0; - } - - this.level.setText(Out = Long.toString(result)); - - NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", Out)); - } catch (final NumberFormatException e) { - // nope.. - this.level.setText("0"); - } - } - @Override public boolean charTyped(char character, int key) { - // Forward entered characters to the number-text-field - return level.charTyped(character, key); + return super.charTyped(character, key); } - @Override - public boolean keyPressed(int keyCode, int scanCode, int p_keyPressed_3_) { - if (!this.checkHotbarKeys(InputMappings.getInputByCode(keyCode, scanCode))) { - if (keyCode == 211 || keyCode == 205 || keyCode == 203 || keyCode == 14) { - String Out = this.level.getText(); - - boolean Fixed = false; - while (Out.startsWith("0") && Out.length() > 1) { - Out = Out.substring(1); - Fixed = true; - } - - if (Fixed) { - this.level.setText(Out); - } - - if (Out.isEmpty()) { - Out = "0"; - } - - NetworkHandler.instance().sendToServer(new ConfigValuePacket("LevelEmitter.Value", Out)); - return true; - } - } - - return super.keyPressed(keyCode, scanCode, p_keyPressed_3_); + public void tick() { + super.tick(); + this.level.tick(); } + } diff --git a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java new file mode 100644 index 000000000..b113c7102 --- /dev/null +++ b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java @@ -0,0 +1,111 @@ +package appeng.client.gui.implementations; + +import appeng.client.gui.AEBaseScreen; +import appeng.client.gui.widgets.NumberBox; +import appeng.core.AEConfig; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.IGuiEventListener; +import net.minecraft.client.gui.widget.button.Button; + +import java.util.function.Consumer; +import java.util.function.LongConsumer; + +/** + * A utility widget that consists of a text-field to enter a number with attached buttons to + * increment/decrement the number in fixed intervals. + */ +public class NumberEntryWidget { + + private final AEBaseScreen parent; + + private final int x; + private final int y; + + private final NumberBox level; + private Button plus1; + private Button plus10; + private Button plus100; + private Button plus1000; + private Button minus1; + private Button minus10; + private Button minus100; + private Button minus1000; + + public NumberEntryWidget(AEBaseScreen parent, int x, int y, int width, LongConsumer changeListener) { + this.parent = parent; + this.x = x; + this.y = y; + + FontRenderer font = parent.getMinecraft().fontRenderer; + this.level = new NumberBox(font, parent.getGuiLeft() + x + 5, parent.getGuiTop() + y + 27, width, font.FONT_HEIGHT, + Long.class, changeListener); + this.level.setEnableBackgroundDrawing(false); + this.level.setMaxStringLength(16); + this.level.setTextColor(0xFFFFFF); + this.level.setVisible(true); + this.level.setFocused2(true); + parent.setFocusedDefault(this.level); + } + + public void setActive(boolean active) { + this.level.setEnabled(active); + this.plus1.active = active; + this.plus10.active = active; + this.plus100.active = active; + this.plus1000.active = active; + this.minus1.active = active; + this.minus10.active = active; + this.minus100.active = active; + this.minus1000.active = active; + } + + public void addButtons(Consumer addChildren, Consumer