Merge branch '1.10'

* 1.10:
  Bump version to 9.1.1
  Fixed IC2 crash
  Fixed Infusing Factory losing infuse storage, implement CTM model caching
  Fix rendering of handheld items
  Fixed Tesla mod ID
  Update Tesla API, render fixes
  Fixed some rendering issues
  Fixed EnergyAcceptorWrapper crash
  Fixed Atomic Disassembler attack speed
  Fixed CME when checking recipes
  Fixed Digital Miner text scaling, fixed MCMP version, fixed Digital Miner crash
  Better Creative Energy Cube config
  Added a NONE TransformType check
  Add proper crash check
  Restrict Thermal Evaporation Plant output to needed
  Fix rendering crashes
This commit is contained in:
aidancbrady committed 2016-08-05 21:28:45 -04:00
commit 738c5c8ba6
99 files changed
+725 -1429

No files matched your search

+2 -2
View File
@@ -1,6 +1,6 @@
minecraft_version=1.10.2
mappings_version=snapshot_20160627
forge_version=12.18.1.2014
mcmp_version=1.2.0_72
mcmp_version=1.2.0_74
jei_version=3.7.6.231
mod_version=9.1.0
mod_version=9.1.1
+1 -1
View File
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = Constants.MOD_ID, name = Constants.MOD_NAME, version = Constants.VERSION_NUMBER)
@Mod(modid = Constants.MOD_ID, name = Constants.MOD_NAME, version = Constants.VERSION_NUMBER, acceptedMinecraftVersions = "[1.9.4,1.10.2]")
public class Tesla {
@Mod.Instance(Constants.MOD_ID)
@@ -1,225 +0,0 @@
package net.darkhax.tesla.api;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.INBTSerializable;
/**
* A basic Tesla container that serves as a consumer, producer and holder. Custom
* implementations do not need to use all three. The INBTSerializable interface is also
* optional.
*
* @deprecated Moved to net.darkhax.tesla.api.implementation
*/
@Deprecated
public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITeslaHolder, INBTSerializable<NBTTagCompound> {
/**
* The amount of stored Tesla power.
*/
private long stored;
/**
* The maximum amount of Tesla power that can be stored.
*/
private long capacity;
/**
* The maximum amount of Tesla power that can be accepted.
*/
private long inputRate;
/**
* The maximum amount of Tesla power that can be extracted
*/
private long outputRate;
/**
* Default constructor. Sets capacity to 5000 and transfer rate to 50. This constructor
* will not set the amount of stored power. These values are arbitrary and should not be
* taken as a base line for balancing.
*/
public BaseTeslaContainer() {
this(5000, 50, 50);
}
/**
* Constructor for setting the basic values. Will not construct with any stored power.
*
* @param capacity The maximum amount of Tesla power that the container should hold.
* @param input The maximum rate of power that can be accepted at a time.
* @param output The maximum rate of power that can be extracted at a time.
*/
public BaseTeslaContainer(long capacity, long input, long output) {
this(0, capacity, input, output);
}
/**
* Constructor for setting all of the base values, including the stored power.
*
* @param power The amount of stored power to initialize the container with.
* @param capacity The maximum amount of Tesla power that the container should hold.
* @param input The maximum rate of power that can be accepted at a time.
* @param output The maximum rate of power that can be extracted at a time.
*/
public BaseTeslaContainer(long power, long capacity, long input, long output) {
this.stored = power;
this.capacity = capacity;
this.inputRate = input;
this.outputRate = output;
}
/**
* Constructor for creating an instance directly from a compound tag. This expects that the
* compound tag has some of the required data. @See {@link #deserializeNBT(NBTTagCompound)}
* for precise info on what is expected. This constructor will only set the stored power if
* it has been written on the compound tag.
*
* @param dataTag The NBTCompoundTag to read the important data from.
*/
public BaseTeslaContainer(NBTTagCompound dataTag) {
this.deserializeNBT(dataTag);
}
@Override
public long getStoredPower () {
return this.stored;
}
@Override
public long givePower (long Tesla, boolean simulated) {
final long acceptedTesla = Math.min(this.capacity - this.stored, Math.min(this.inputRate, Tesla));
if (!simulated)
this.stored += acceptedTesla;
return acceptedTesla;
}
@Override
public long takePower (long Tesla, boolean simulated) {
final long removedPower = Math.min(this.stored, Math.min(this.outputRate, Tesla));
if (!simulated)
this.stored -= removedPower;
return removedPower;
}
@Override
public long getCapacity () {
return this.capacity;
}
@Override
public NBTTagCompound serializeNBT () {
final NBTTagCompound dataTag = new NBTTagCompound();
dataTag.setLong("TeslaPower", this.stored);
dataTag.setLong("TeslaCapacity", this.capacity);
dataTag.setLong("TeslaInput", this.inputRate);
dataTag.setLong("TeslaOutput", this.outputRate);
return dataTag;
}
@Override
public void deserializeNBT (NBTTagCompound nbt) {
this.stored = nbt.getLong("TeslaPower");
if (nbt.hasKey("TeslaCapacity"))
this.capacity = nbt.getLong("TeslaCapacity");
if (nbt.hasKey("TeslaInput"))
this.inputRate = nbt.getLong("TeslaInput");
if (nbt.hasKey("TeslaOutput"))
this.outputRate = nbt.getLong("TeslaOutput");
if (this.stored > this.capacity)
this.stored = this.capacity;
}
/**
* Sets the capacity of the the container. If the existing stored power is more than the
* new capacity, the stored power will be decreased to match the new capacity.
*
* @param capacity The new capacity for the container.
* @return The instance of the container being updated.
*/
public BaseTeslaContainer setCapacity (long capacity) {
this.capacity = capacity;
if (this.stored > capacity)
this.stored = capacity;
return this;
}
/**
* Gets the maximum amount of Tesla power that can be accepted by the container.
*
* @return The amount of Tesla power that can be accepted at any time.
*/
public long getInputRate () {
return this.inputRate;
}
/**
* Sets the maximum amount of Tesla power that can be accepted by the container.
*
* @param rate The amount of Tesla power to accept at a time.
* @return The instance of the container being updated.
*/
public BaseTeslaContainer setInputRate (long rate) {
this.inputRate = rate;
return this;
}
/**
* Gets the maximum amount of Tesla power that can be pulled from the container.
*
* @return The amount of Tesla power that can be extracted at any time.
*/
public long getOutputRate () {
return this.outputRate;
}
/**
* Sets the maximum amount of Tesla power that can be pulled from the container.
*
* @param rate The amount of Tesla power that can be extracted.
* @return The instance of the container being updated.
*/
public BaseTeslaContainer setOutputRate (long rate) {
this.outputRate = rate;
return this;
}
/**
* Sets both the input and output rates of the container at the same time. Both rates will
* be the same.
*
* @param rate The input/output rate for the Tesla container.
* @return The instance of the container being updated.
*/
public BaseTeslaContainer setTransferRate (long rate) {
this.setInputRate(rate);
this.setOutputRate(rate);
return this;
}
}
+1 -1
View File
@@ -7,7 +7,7 @@ public interface ITeslaConsumer {
*
* @param power The amount of power to offer.
* @param simulated Whether or not this is being called as part of a simulation.
* Simulations are used to get information without affecting the Tesla Producer.
* Simulations are used to get information without affecting the Tesla Producer.
* @return The amount of power that the consumer accepts.
*/
long givePower (long power, boolean simulated);
View File
File mode changed.
+1 -1
View File
@@ -7,7 +7,7 @@ public interface ITeslaProducer {
*
* @param power The amount of power to request.
* @param simulated Whether or not this is being called as part of a simulation.
* Simulations are used to get information without affecting the Tesla Producer.
* Simulations are used to get information without affecting the Tesla Producer.
* @return The amount of power that the Tesla Producer will give.
*/
long takePower (long power, boolean simulated);
@@ -1,16 +0,0 @@
package net.darkhax.tesla.api;
/**
* Logic for a Tesla Consumer that will consume infinite amounts of power.
*
* @deprecated Moved to net.darkhax.tesla.api.implementation
*/
@Deprecated
public class InfiniteTeslaConsumer implements ITeslaConsumer {
@Override
public long givePower (long power, boolean simulated) {
return power;
}
}
@@ -1,16 +0,0 @@
package net.darkhax.tesla.api;
/**
* Logic for a Tesla Producer that will produce an infinite amount of energy.
*
* @deprecated Moved to net.darkhax.tesla.api.implementation
*/
@Deprecated
public class InfiniteTeslaProducer implements ITeslaProducer {
@Override
public long takePower (long power, boolean simulated) {
return power;
}
}
+4 -4
View File
@@ -93,7 +93,7 @@ public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITesl
@Override
public long givePower (long Tesla, boolean simulated) {
final long acceptedTesla = Math.min(this.capacity - this.stored, Math.min(this.inputRate, Tesla));
final long acceptedTesla = Math.min(this.getCapacity() - this.stored, Math.min(this.getInputRate(), Tesla));
if (!simulated)
this.stored += acceptedTesla;
@@ -104,7 +104,7 @@ public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITesl
@Override
public long takePower (long Tesla, boolean simulated) {
final long removedPower = Math.min(this.stored, Math.min(this.outputRate, Tesla));
final long removedPower = Math.min(this.stored, Math.min(this.getOutputRate(), Tesla));
if (!simulated)
this.stored -= removedPower;
@@ -144,8 +144,8 @@ public class BaseTeslaContainer implements ITeslaConsumer, ITeslaProducer, ITesl
if (nbt.hasKey("TeslaOutput"))
this.outputRate = nbt.getLong("TeslaOutput");
if (this.stored > this.capacity)
this.stored = this.capacity;
if (this.stored > this.getCapacity())
this.stored = this.getCapacity();
}
/**
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
+9
View File
@@ -11,12 +11,21 @@ import net.minecraftforge.common.capabilities.CapabilityInject;
public class TeslaCapabilities {
/**
* Access to the consumer capability. Can be used for making checks.
*/
@CapabilityInject(ITeslaConsumer.class)
public static Capability<ITeslaConsumer> CAPABILITY_CONSUMER = null;
/**
* Access to the producer capability. Can be used for making checks.
*/
@CapabilityInject(ITeslaProducer.class)
public static Capability<ITeslaProducer> CAPABILITY_PRODUCER = null;
/**
* Access to the holder capability. Can be used for making checks.
*/
@CapabilityInject(ITeslaHolder.class)
public static Capability<ITeslaHolder> CAPABILITY_HOLDER = null;
+2 -2
View File
@@ -2,7 +2,7 @@ package net.darkhax.tesla.lib;
public class Constants {
public static final String MOD_ID = "Tesla";
public static final String MOD_ID = "tesla";
public static final String MOD_NAME = "TESLA";
public static final String VERSION_NUMBER = "1.1.0.0";
public static final String VERSION_NUMBER = "1.2.1.0";
}
+103
View File
@@ -0,0 +1,103 @@
package net.darkhax.tesla.lib;
import net.darkhax.tesla.api.ITeslaHolder;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class PowerBar {
/**
* Constant reference to the included gui element sheet.
*/
private static final ResourceLocation TEXTURE_SHEET = new ResourceLocation("tesla", "textures/gui/elements.png");
/**
* The x position of the power bar on the screen.
*/
private final int x;
/**
* The y position of the power bar on the screen.
*/
private final int y;
/**
* The screen to draw the power bar on.
*/
private final GuiScreen screen;
/**
* The type of background the use when drawing the power bar.
*/
private final BackgroundType background;
/**
* Object that can be used to draw a power bar on the screen.
*
* @param screen The screen to draw the power bar on.
* @param x The x position of the power bar on the screen.
* @param y The y position of the power bar on the screen.
* @param type The background type to use for the power bar.
*/
public PowerBar(GuiScreen screen, int x, int y, BackgroundType type) {
this.background = type;
this.screen = screen;
this.x = x;
this.y = y;
}
/**
* Draws a power bar that represents the power held within an ITeslaHolder.
*
* @param holder The holder to represent.
*/
public void draw (ITeslaHolder holder) {
draw(holder.getStoredPower(), holder.getCapacity());
}
/**
* Draws a power bard that represents the based power information.
*
* @param power The amount of power to represent.
* @param capacity The capacity to represent.
*/
public void draw (long power, long capacity) {
screen.mc.getTextureManager().bindTexture(TEXTURE_SHEET);
if (this.background == BackgroundType.LIGHT)
screen.drawTexturedModalRect(x, y, 3, 1, 14, 50);
else if (this.background == BackgroundType.DARK)
screen.drawTexturedModalRect(x, y, 3, 53, 14, 50);
long powerOffset = (power * 51) / capacity;
screen.drawTexturedModalRect(x + 1, (int) (y + 50 - powerOffset), 18, (int) (51 - powerOffset), 14, (int) (powerOffset + 2));
}
/**
* Describes a background image to be rendered for a power bar.
*/
public enum BackgroundType {
/**
* No background texture.
*/
NONE,
/**
* The lighter background texture.
*/
LIGHT,
/**
* The darker background texture.
*/
DARK,
}
}
+136
View File
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import net.darkhax.tesla.api.ITeslaConsumer;
import net.darkhax.tesla.api.ITeslaHolder;
import net.darkhax.tesla.api.ITeslaProducer;
import net.darkhax.tesla.capability.TeslaCapabilities;
import net.minecraft.client.resources.I18n;
@@ -12,6 +13,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
public class TeslaUtils {
@@ -102,6 +104,140 @@ public class TeslaUtils {
return I18n.format("unit.tesla." + getUnitType(tesla));
}
/**
* Checks if a capability provider has support for Tesla.
*
* @param provider The provider to check. ItemStack/TileEntity/Entity and so on.
* @param side The side to check.
* @return Whether or not the provider has support for Tesla.
*/
public static boolean hasTeslaSupport (ICapabilityProvider provider, EnumFacing side) {
return isTeslaHolder(provider, side) || isTeslaConsumer(provider, side) || isTeslaProducer(provider, side);
}
/**
* Checks if a capability provider is a Tesla holder.
*
* @param provider The provider to check. ItemStack/TileEntity/Entity and so on.
* @param side The side to check.
* @return Whether or not the provider is a Tesla holder.
*/
public static boolean isTeslaHolder (ICapabilityProvider provider, EnumFacing side) {
return provider.hasCapability(TeslaCapabilities.CAPABILITY_HOLDER, side);
}
/**
* Checks if a capability provider is a Tesla consumer.
*
* @param provider The provider to check. ItemStack/TileEntity/Entity and so on.
* @param side The side to check.
* @return Whether or not the provider is a Tesla consumer.
*/
public static boolean isTeslaConsumer (ICapabilityProvider provider, EnumFacing side) {
return provider.hasCapability(TeslaCapabilities.CAPABILITY_CONSUMER, side);
}
/**
* Checks if a capability provider is a Tesla producer.
*
* @param provider The provider to check. ItemStack/TileEntity/Entity and so on.
* @param side The side to check.
* @return Whether or not the provider is a Tesla producer.
*/
public static boolean isTeslaProducer (ICapabilityProvider provider, EnumFacing side) {
return provider.hasCapability(TeslaCapabilities.CAPABILITY_PRODUCER, side);
}
/**
* Gets an ITeslaHolder implementation from the capability provider.
*
* @param provider The provider to get the capability from.
* @param side The side to access;
* @return A Tesla holder implementation, or null if none could be found.
*/
public static ITeslaHolder getTeslaHolder (ICapabilityProvider provider, EnumFacing side) {
return (ITeslaHolder) provider.getCapability(TeslaCapabilities.CAPABILITY_HOLDER, side);
}
/**
* Gets an ITeslaConsumer implementation from the capability provider.
*
* @param provider The provider to get the capability from.
* @param side The side to access;
* @return A Tesla consumer implementation, or null if none could be found.
*/
public static ITeslaConsumer getTeslaConsumer (ICapabilityProvider provider, EnumFacing side) {
return (ITeslaConsumer) provider.getCapability(TeslaCapabilities.CAPABILITY_HOLDER, side);
}
/**
* Gets an ITeslaProducer implementation from the capability provider.
*
* @param provider The provider to get the capability from.
* @param side The side to access;
* @return A Tesla producer implementation, or null if none could be found.
*/
public static ITeslaProducer getTeslaProducer (ICapabilityProvider provider, EnumFacing side) {
return (ITeslaProducer) provider.getCapability(TeslaCapabilities.CAPABILITY_HOLDER, side);
}
/**
* Gets the capacity of a provider.
*
* @param provider The provider to access.
* @param side The side to access.
* @return The capacity of the provider. 0 if it has no capacity.
*/
public static long getCapacity (ICapabilityProvider provider, EnumFacing side) {
return isTeslaHolder(provider, side) ? getTeslaHolder(provider, side).getCapacity() : 0;
}
/**
* Gets the stored power of a provider.
*
* @param provider The provider to access.
* @param side The side to access.
* @return The amount of power stored.
*/
public static long getStoredPower (ICapabilityProvider provider, EnumFacing side) {
return isTeslaHolder(provider, side) ? getTeslaHolder(provider, side).getStoredPower() : 0;
}
/**
* Attempt to give power to a provider.
*
* @param power The amount of power to offer.
* @param simulated Whether or not this is being called as part of a simulation.
* Simulations are used to get information without affecting the Tesla Producer.
* @return The amount of power that the consumer accepts.
*/
public static long givePower (ICapabilityProvider provider, EnumFacing side, long power, boolean simulated) {
return isTeslaConsumer(provider, side) ? getTeslaConsumer(provider, side).givePower(power, simulated) : 0;
}
/**
* Attempts to take power from a provider.
*
* @param power The amount of power to request.
* @param simulated Whether or not this is being called as part of a simulation.
* Simulations are used to get information without affecting the Tesla Producer.
* @return The amount of power that the Tesla Producer will give.
*/
public static long takePower (ICapabilityProvider provider, EnumFacing side, long power, boolean simulated) {
return isTeslaProducer(provider, side) ? getTeslaProducer(provider, side).takePower(power, simulated) : 0;
}
/**
* Gets a list of all capabilities that touch a BlockPos. This will search for tile
* entities touching the BlockPos and then query them for access to their capabilities.
@@ -124,7 +124,7 @@ public class GuiMItemStackFilter extends GuiMekanism
if(filter.itemType != null)
{
fontRendererObj.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00);
renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 107);
}
if(filter.itemType != null)
@@ -125,7 +125,7 @@ public class GuiMMaterialFilter extends GuiMekanism
if(filter.materialItem != null)
{
fontRendererObj.drawString(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00);
renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107);
}
if(filter.materialItem != null)
@@ -181,7 +181,7 @@ public class GuiTItemStackFilter extends GuiMekanism
if(filter.itemType != null)
{
fontRendererObj.drawString(filter.itemType.getDisplayName(), 35, 41, 0x00CD00);
renderScaledText(filter.itemType.getDisplayName(), 35, 41, 0x00CD00, 89);
}
if(filter.itemType != null)
@@ -129,7 +129,7 @@ public class GuiTMaterialFilter extends GuiMekanism
if(filter.materialItem != null)
{
fontRendererObj.drawString(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00);
renderScaledText(filter.materialItem.getDisplayName(), 35, 41, 0x00CD00, 107);
}
if(filter.materialItem != null)
@@ -34,6 +34,7 @@ import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -225,9 +226,38 @@ public class MekanismRenderer
return map.containsKey(fluid) ? map.get(fluid) : missingIcon;
}
public static boolean isDrawing(Tessellator tessellator)
private static VertexFormat prevFormat = null;
private static int prevMode = -1;
public static void pauseRenderer(Tessellator tess)
{
return (boolean)ReflectionUtils.getPrivateValue(tessellator.getBuffer(), VertexBuffer.class, ObfuscatedNames.VertexBuffer_isDrawing);
if(MekanismRenderer.isDrawing(tess))
{
prevFormat = tess.getBuffer().getVertexFormat();
prevMode = tess.getBuffer().getDrawMode();
tess.draw();
}
}
public static void resumeRenderer(Tessellator tess)
{
if(prevFormat != null)
{
tess.getBuffer().begin(prevMode, prevFormat);
}
prevFormat = null;
prevMode = -1;
}
public static boolean isDrawing(Tessellator tess)
{
return isDrawing(tess.getBuffer());
}
public static boolean isDrawing(VertexBuffer buffer)
{
return (boolean)ReflectionUtils.getPrivateValue(buffer, VertexBuffer.class, ObfuscatedNames.VertexBuffer_isDrawing);
}
public static class Model3D
@@ -12,6 +12,7 @@ import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap;
import java.util.EnumMap;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;
@@ -157,6 +158,19 @@ public class CTM {
return submapCache;
}
public int[] createSubmapIndices(long data, EnumFacing side){
submapCache = new int[] { 18, 19, 17, 16 };
buildConnectionMap(data, side);
// Map connections to submap indeces
for (int i = 0; i < 4; i++) {
fillSubmaps(i);
}
return submapCache;
}
public int[] getSubmapIndices() {
return submapCache;
}
@@ -174,6 +188,18 @@ public class CTM {
connectionMap.put(dir, dir.isConnected(this, world, pos, side, state));
}
}
public void buildConnectionMap(long data, EnumFacing side){
for (Dir dir : Dir.VALUES){
connectionMap.put(dir, false);
}
List<CTMConnections> connections = CTMConnections.decode(data);
for (CTMConnections loc : connections){
if (loc.getDirForSide(side) != null){
connectionMap.put(loc.getDirForSide(side), true);
}
}
}
private void fillSubmaps(int idx) {
Dir[] dirs = submapMap.get(idx);
@@ -298,7 +324,7 @@ public class CTM {
return ret;
}
public IBlockState getBlockOrFacade(IBlockAccess world, BlockPos pos, EnumFacing side) {
public static IBlockState getBlockOrFacade(IBlockAccess world, BlockPos pos, EnumFacing side) {
IBlockState state = world.getBlockState(pos);
return state;
}
@@ -6,9 +6,17 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import org.apache.commons.lang3.ArrayUtils;
import static mekanism.client.render.ctm.CTMConnections.*;
public class CTMBlockRenderContext
{
private static final CTMConnections[] CACHED_LOCATIONS = ArrayUtils.removeElements(CTMConnections.VALUES, UP_UP, DOWN_DOWN, EAST_EAST, WEST_WEST, NORTH_NORTH, SOUTH_SOUTH);
private EnumMap<EnumFacing, CTM> ctmData = new EnumMap<>(EnumFacing.class);
private long data;
public CTMBlockRenderContext(IBlockAccess world, BlockPos pos)
{
@@ -18,6 +26,20 @@ public class CTMBlockRenderContext
ctm.createSubmapIndices(world, pos, face);
ctmData.put(face, ctm);
}
data = CTMConnections.getData(world, pos, CACHED_LOCATIONS);
}
public CTMBlockRenderContext(long d)
{
data = d;
for(EnumFacing face : EnumFacing.VALUES)
{
CTM ctm = createCTM();
ctm.createSubmapIndices(data, face);
ctmData.put(face, ctm);
}
}
protected CTM createCTM()
@@ -29,4 +51,9 @@ public class CTMBlockRenderContext
{
return ctmData.get(face);
}
public long serialize()
{
return data;
}
}
@@ -0,0 +1,182 @@
package mekanism.client.render.ctm;
import java.util.ArrayList;
import java.util.List;
import mekanism.api.MekanismAPI;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
/**
* Represents all the different spot for connection locations for a ctm block
*/
public enum CTMConnections
{
UP(Dir.TOP),
DOWN(Dir.BOTTOM),
NORTH(EnumFacing.EAST, Dir.RIGHT),
SOUTH(EnumFacing.EAST, Dir.LEFT),
EAST(Dir.RIGHT),
WEST(Dir.LEFT),
NORTH_EAST(EnumFacing.UP, Dir.TOP_RIGHT),
NORTH_WEST(EnumFacing.UP, Dir.TOP_LEFT),
SOUTH_EAST(EnumFacing.UP, Dir.BOTTOM_RIGHT),
SOUTH_WEST(EnumFacing.UP, Dir.BOTTOM_LEFT),
NORTH_UP(EnumFacing.EAST, Dir.TOP_RIGHT),
NORTH_DOWN(EnumFacing.EAST, Dir.BOTTOM_RIGHT),
SOUTH_UP(EnumFacing.EAST, Dir.TOP_LEFT),
SOUTH_DOWN(EnumFacing.EAST, Dir.BOTTOM_LEFT),
EAST_UP(Dir.TOP_RIGHT),
EAST_DOWN(Dir.BOTTOM_RIGHT),
WEST_UP(Dir.TOP_LEFT),
WEST_DOWN(Dir.BOTTOM_LEFT),
NORTH_EAST_UP(EnumFacing.EAST, Dir.TOP_RIGHT, true),
NORTH_EAST_DOWN(EnumFacing.EAST, Dir.BOTTOM_RIGHT, true),
SOUTH_EAST_UP(EnumFacing.EAST, Dir.TOP_LEFT, true),
SOUTH_EAST_DOWN(EnumFacing.EAST, Dir.BOTTOM_LEFT, true),
SOUTH_WEST_UP(EnumFacing.WEST, Dir.TOP_LEFT, true),
SOUTH_WEST_DOWN(EnumFacing.WEST, Dir.BOTTOM_LEFT, true),
NORTH_WEST_UP(EnumFacing.WEST, Dir.TOP_RIGHT, true),
NORTH_WEST_DOWN(EnumFacing.WEST, Dir.BOTTOM_RIGHT, true),
UP_UP(EnumFacing.UP, null, true),
DOWN_DOWN(EnumFacing.DOWN, null, true),
NORTH_NORTH(EnumFacing.NORTH, null, true),
SOUTH_SOUTH(EnumFacing.SOUTH, null, true),
EAST_EAST(EnumFacing.EAST, null, true),
WEST_WEST(EnumFacing.WEST, null, true),
;
public static final CTMConnections[] VALUES = values();
/**
* The enum facing directions needed to get to this connection location
*/
private EnumFacing normal;
private Dir dir;
private boolean offset;
private CTMConnections(Dir dir) {
this(EnumFacing.SOUTH, dir);
}
private CTMConnections(Dir dir, boolean offset) {
this(EnumFacing.SOUTH, dir, offset);
}
private CTMConnections(EnumFacing normal, Dir dir){
this(normal, dir, false);
}
private CTMConnections(EnumFacing normal, Dir dir, boolean offset) {
this.normal = normal;
this.dir = dir;
this.offset = offset;
}
public Dir getDirForSide(EnumFacing facing){
return dir == null ? null : dir;//TODO .relativize()
}
public EnumFacing clipOrDestroy(EnumFacing direction) {
EnumFacing[] dirs = dir == null ? new EnumFacing[] {normal, normal} : dir.getNormalizedDirs(direction);
if (dirs[0] == direction) {
return dirs.length > 1 ? dirs[1] : null;
} else if (dirs.length > 1 && dirs[1] == direction) {
return dirs[0];
} else {
return null;
}
}
public BlockPos transform(BlockPos pos) {
if (dir != null) {
for (EnumFacing facing : dir.getNormalizedDirs(normal)) {
pos = pos.offset(facing);
}
} else {
pos = pos.offset(normal);
}
if (offset) {
pos = pos.offset(normal);
}
return pos;
}
public static CTMConnections fromFacing(EnumFacing facing){
switch (facing){
case NORTH: return NORTH;
case SOUTH: return SOUTH;
case EAST: return EAST;
case WEST: return WEST;
case UP: return UP;
case DOWN: return DOWN;
default: return NORTH;
}
}
public static EnumFacing toFacing(CTMConnections loc){
switch (loc){
case NORTH: return EnumFacing.NORTH;
case SOUTH: return EnumFacing.SOUTH;
case EAST: return EnumFacing.EAST;
case WEST: return EnumFacing.WEST;
case UP: return EnumFacing.UP;
case DOWN: return EnumFacing.DOWN;
default: return EnumFacing.NORTH;
}
}
public static List<CTMConnections> decode(long data) {
List<CTMConnections> list = new ArrayList<>();
for (CTMConnections loc : values()) {
if ((1 & (data >> loc.ordinal())) != 0) {
list.add(loc);
}
}
return list;
}
public long getMask(){
return 1 << ordinal();
}
public static List<CTMConnections> getConnections(IBlockAccess world, BlockPos pos, CTMConnections[] values){
List<CTMConnections> locs = new ArrayList<>();
IBlockState state = world.getBlockState(pos);
for (CTMConnections loc : values) {
BlockPos second = loc.transform(pos);
if (state.equals(CTM.getBlockOrFacade(world, second, null))){
locs.add(loc);
}
}
return locs;
}
public static long getData(IBlockAccess world, BlockPos pos, CTMConnections[] values){
List<CTMConnections> locs = getConnections(world, pos, values);
long data = 0;
for (CTMConnections loc : locs){
data = data | loc.getMask();
}
if (MekanismAPI.debug) {
String s = Long.toBinaryString(data);
while (s.length() < 32) {
s = "0" + s;
}
System.out.println(pos + ": " + s);
}
return data;
}
}
@@ -1,8 +1,10 @@
package mekanism.client.render.ctm;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.vecmath.Matrix4f;
@@ -20,43 +22,48 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.IPerspectiveAwareModel;
import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraftforge.common.property.IExtendedBlockState;
import org.apache.commons.lang3.tuple.Pair;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.MultimapBuilder;
import com.google.common.collect.Table;
import com.google.common.collect.Tables;
/**
* Model for all chisel blocks
* Model for all CTM blocks, credit to Chisel
*/
@SuppressWarnings("deprecation")
public class CTMModelFactory implements IPerspectiveAwareModel
{
private List<BakedQuad> face;
private List<BakedQuad> general;
private ListMultimap<BlockRenderLayer, BakedQuad> genQuads = MultimapBuilder.enumKeys(BlockRenderLayer.class).arrayListValues().build();
private Table<BlockRenderLayer, EnumFacing, List<BakedQuad>> faceQuads = Tables.newCustomTable(Maps.newEnumMap(BlockRenderLayer.class), () -> Maps.newEnumMap(EnumFacing.class));
private ModelCTM model;
private CTMOverride override = new CTMOverride();
public CTMModelFactory(List<BakedQuad> f, List<BakedQuad> g, ModelCTM m)
public CTMModelFactory(ModelCTM m)
{
face = f;
general = g;
model = m;
}
public CTMModelFactory(ModelCTM model)
{
this(Collections.emptyList(), Collections.emptyList(), model);
}
private static Cache<Integer, CTMModelFactory> ctmCache = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.MINUTES).maximumSize(500).<Integer, CTMModelFactory>build();
@Override
public List<BakedQuad> getQuads(IBlockState stateIn, EnumFacing side, long rand)
{
@@ -65,14 +72,29 @@ public class CTMModelFactory implements IPerspectiveAwareModel
if(stateIn != null && stateIn.getBlock() instanceof ICTMBlock && stateIn instanceof IExtendedBlockState)
{
IExtendedBlockState state = (IExtendedBlockState)stateIn;
IBlockState clean = state.getClean();
CTMBlockRenderContext ctxList = state.getValue(BlockStateBasic.ctmProperty);
baked = createModel(stateIn, model, ctxList);
try {
if(ctxList == null)
{
baked = ctmCache.get(Objects.hash(clean, -1), () -> createModel(state, model, null));
}
else {
long serialized = ctxList.serialize();
baked = ctmCache.get(Objects.hash(clean, serialized), () -> createModel(state, model, ctxList));
}
} catch(Exception e) {
e.printStackTrace();
return Lists.newArrayList();
}
}
else {
baked = this;
}
return side == null ? baked.general : FluentIterable.from(baked.face).filter(quad -> quad.getFace() == side).toList();
BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer();
return side == null ? baked.genQuads.get(layer) : layer == null ? baked.faceQuads.column(side).values().stream().flatMap(List::stream).collect(Collectors.toList()) : baked.faceQuads.get(layer, side);
}
@Override
@@ -107,33 +129,48 @@ public class CTMModelFactory implements IPerspectiveAwareModel
private CTMModelFactory createModel(IBlockState state, ModelCTM model, CTMBlockRenderContext ctx)
{
List<BakedQuad> faceQuads = Lists.newArrayList();
List<BakedQuad> generalQuads = Lists.newArrayList();
CTMModelFactory ret = new CTMModelFactory(model);
IBakedModel baked = model.getModel(state);
int quadGoal = ctx == null ? 1 : CTM.QUADS_PER_SIDE;
List<BakedQuad> quads = Lists.newArrayList();
for(EnumFacing facing : EnumFacing.VALUES)
for(BlockRenderLayer layer : BlockRenderLayer.values())
{
TextureCTM face = model.getFace(facing);
ICTMBlock block = (ICTMBlock)state.getBlock();
CTMData data = block.getCTMData(state);
if(block.getOverrideTexture(state, facing) != null)
{
face = CTMRegistry.textureCache.get(block.getOverrideTexture(state, facing));
}
for(EnumFacing facing : EnumFacing.VALUES)
{
TextureCTM face = model.getFace(facing);
if(ctx == null || layer == face.layer)
{
ICTMBlock block = (ICTMBlock)state.getBlock();
CTMData data = block.getCTMData(state);
if(block.getOverrideTexture(state, facing) != null)
{
face = CTMRegistry.textureCache.get(block.getOverrideTexture(state, facing));
}
int quadGoal = ctx == null ? 1 : CTM.QUADS_PER_SIDE;
IBakedModel baked = model.getModel(state);
List<BakedQuad> origFaceQuads = baked.getQuads(state, facing, 0);
List<BakedQuad> origGeneralQuads = FluentIterable.from(baked.getQuads(state, null, 0)).filter(q -> q.getFace() == facing).toList();
addAllQuads(origFaceQuads, face, ctx, state, quadGoal, faceQuads);
addAllQuads(origGeneralQuads, face, ctx, state, quadGoal, generalQuads);
List<BakedQuad> temp = baked.getQuads(state, facing, 0);
addAllQuads(temp, face, ctx, state, quadGoal, quads);
ret.faceQuads.put(layer, facing, ImmutableList.copyOf(quads));
temp = FluentIterable.from(baked.getQuads(state, null, 0)).filter(q -> q.getFace() == facing).toList();
addAllQuads(temp, face, ctx, state, quadGoal, quads);
ret.genQuads.putAll(layer, temp);
}
else {
ret.faceQuads.put(layer, facing, Lists.newArrayList());
}
}
}
return new CTMModelFactory(faceQuads, generalQuads, model);
return ret;
}
private void addAllQuads(List<BakedQuad> from, TextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List<BakedQuad> to)
{
to.clear();
for(BakedQuad q : from)
{
to.addAll(tex.transformQuad(q, ctx == null ? null : ctx, quadGoal));
@@ -158,6 +195,7 @@ public class CTMModelFactory implements IPerspectiveAwareModel
.put(TransformType.GROUND, get(0, 2, 0, 0, 0, 0, 0.25f))
.put(TransformType.HEAD, get(0, 0, 0, 0, 0, 0, 1))
.put(TransformType.FIXED, get(0, 0, 0, 0, 0, 0, 1))
.put(TransformType.NONE, get(0, 0, 0, 0, 0, 0, 0))
.build();
@Override
@@ -75,10 +75,10 @@ public class CTMRegistry
callbacks[0] = new TextureSpriteCallback(new ResourceLocation(domain + ":blocks/ctm/" + name));
callbacks[1] = new TextureSpriteCallback(new ResourceLocation(domain + ":blocks/ctm/" + name + "-ctm"));
register(callbacks[0]);
register(callbacks[1]);
return new TextureCTM(BlockRenderLayer.SOLID, callbacks);
return new TextureCTM(BlockRenderLayer.CUTOUT, callbacks);
}
}
@@ -90,7 +90,7 @@ public enum Dir {
return connection;
}
private EnumFacing[] getNormalizedDirs(EnumFacing normal) {
public EnumFacing[] getNormalizedDirs(EnumFacing normal) {
if (normal == NORMAL) {
return dirs;
} else if (normal == NORMAL.getOpposite()) {
@@ -62,7 +62,6 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
@@ -426,12 +425,9 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
Tessellator tessellator = Tessellator.getInstance();
VertexFormat prevFormat = null;
int prevMode = -1;
if(MekanismRenderer.isDrawing(tessellator))
{
prevFormat = tessellator.getBuffer().getVertexFormat();
tessellator.draw();
}
MekanismRenderer.pauseRenderer(tessellator);
List<BakedQuad> generalQuads = new LinkedList<BakedQuad>();
@@ -448,11 +444,7 @@ public class BakedCustomItemModel implements IBakedModel, IPerspectiveAwareModel
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.popMatrix();
if(prevFormat != null)
{
VertexBuffer worldrenderer = tessellator.getBuffer();
worldrenderer.begin(7, prevFormat);
}
MekanismRenderer.resumeRenderer(tessellator);
if(Block.getBlockFromItem(stack.getItem()) != null)
{
@@ -46,7 +46,7 @@ public class RenderDigitalMiner extends TileEntitySpecialRenderer<TileEntityDigi
}
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
model.render(0.0625F, tileEntity.isActive, rendererDispatcher.renderEngine, false);
model.render(0.0625F, tileEntity.isActive, rendererDispatcher.renderEngine, true);
GlStateManager.popMatrix();
if(tileEntity.clientRendering)
@@ -30,7 +30,7 @@ public class RenderResistiveHeater extends TileEntitySpecialRenderer<TileEntityR
}
GlStateManager.rotate(180F, 0.0F, 0.0F, 1.0F);
model.render(0.0625F, tileEntity.isActive, rendererDispatcher.renderEngine, false);
model.render(0.0625F, tileEntity.isActive, rendererDispatcher.renderEngine, true);
GlStateManager.popMatrix();
}
}
@@ -111,7 +111,6 @@ public class RenderMechanicalPipe extends RenderTransmitterBase<PartMechanicalPi
}
}
isDrawing = false;
DisplayInteger[] displayLists = getListAndRender(null, fluid);
if(displayLists != null)
@@ -38,7 +38,6 @@ public class RenderPressurizedTube extends RenderTransmitterBase<PartPressurized
MekanismRenderer.glowOn(0);
tessellator.draw();
isDrawing = false;
MekanismRenderer.glowOff();
@@ -38,7 +38,6 @@ public class RenderThermodynamicConductor extends RenderTransmitterBase<PartTher
MekanismRenderer.glowOn();
tessellator.draw();
isDrawing = false;
MekanismRenderer.glowOff();
pop();
@@ -63,14 +63,11 @@ public abstract class RenderTransmitterBase<T extends PartTransmitter> extends M
GL11.glPopMatrix();
}
public static boolean isDrawing = false;
public void renderTransparency(VertexBuffer renderer, TextureAtlasSprite icon, IBakedModel cc, ColourRGBA color)
{
if(!isDrawing)
if(!MekanismRenderer.isDrawing(renderer))
{
renderer.begin(GL11.GL_QUADS, DefaultVertexFormats.ITEM);
isDrawing = true;
}
for(EnumFacing side : EnumFacing.values())
@@ -38,7 +38,6 @@ public class RenderUniversalCable extends RenderTransmitterBase<PartUniversalCab
MekanismRenderer.glowOn();
tessellator.draw();
isDrawing = false;
MekanismRenderer.glowOff();
pop();
+2 -2
View File
@@ -160,7 +160,7 @@ import com.mojang.authlib.GameProfile;
* @author AidanBrady
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
public class Mekanism
@@ -186,7 +186,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(9, 1, 0);
public static Version versionNumber = new Version(9, 1, 1);
/** MultiblockManagers for various structrures */
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
@@ -20,7 +20,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
public static EnergyAcceptorWrapper get(TileEntity tileEntity, EnumFacing side)
{
if(tileEntity != null && tileEntity.getWorld() == null)
if(tileEntity == null || tileEntity.getWorld() == null)
{
return null;
}
@@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -60,7 +60,7 @@ public abstract class MinerFilter
if(dataStream.readBoolean())
{
replaceStack = new ItemStack(Block.getBlockById(dataStream.readInt()), 1, dataStream.readInt());
replaceStack = new ItemStack(Item.getItemById(dataStream.readInt()), 1, dataStream.readInt());
}
else {
replaceStack = null;
@@ -12,9 +12,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@InterfaceList({
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla")
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "tesla")
})
public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaProducer
{
@@ -29,28 +29,28 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long getStoredPower()
{
return (long)Math.round(tileEntity.getEnergy()*general.TO_TESLA);
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long getCapacity()
{
return (long)Math.round(tileEntity.getMaxEnergy()*general.TO_TESLA);
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long takePower(long power, boolean simulated)
{
return (long)Math.round(tileEntity.removeEnergyFromProvider(side, power*general.FROM_TESLA)*general.TO_TESLA);
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long givePower(long power, boolean simulated)
{
return (long)Math.round(tileEntity.transferEnergyToAcceptor(side, power*general.FROM_TESLA)*general.TO_TESLA);
@@ -13,9 +13,9 @@ import net.minecraftforge.fml.common.Optional.InterfaceList;
import net.minecraftforge.fml.common.Optional.Method;
@InterfaceList({
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "Tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "Tesla")
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaProducer", modid = "tesla"),
@Interface(iface = "net.darkhax.tesla.api.ITeslaHolder", modid = "tesla")
})
public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, ITeslaConsumer, ITeslaProducer
{
@@ -33,7 +33,7 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long takePower(long power, boolean simulated)
{
if(getItem().canSend(getStack()))
@@ -53,7 +53,7 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long givePower(long power, boolean simulated)
{
if(getItem().canReceive(getStack()))
@@ -73,14 +73,14 @@ public class TeslaItemWrapper extends ItemCapability implements ITeslaHolder, IT
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long getStoredPower()
{
return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA);
}
@Override
@Method(modid = "Tesla")
@Method(modid = "tesla")
public long getCapacity()
{
return (long)Math.round(getItem().getEnergy(getStack())*general.TO_TESLA);
@@ -6,6 +6,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Multimap;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.general;
@@ -17,9 +19,12 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.DamageSource;
@@ -315,6 +320,19 @@ public class ItemAtomicDisassembler extends ItemEnergized
{
return false;
}
@Override
public Multimap<String, AttributeModifier> getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot)
{
Multimap<String, AttributeModifier> multimap = super.getItemAttributeModifiers(equipmentSlot);
if(equipmentSlot == EntityEquipmentSlot.MAINHAND)
{
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0));
}
return multimap;
}
public static class Finder
{
@@ -11,6 +11,7 @@ import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig.general;
import mekanism.api.Range4D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.api.transmitters.TransmissionType;
import mekanism.client.MekKeyHandler;
import mekanism.client.MekanismKeyHandler;
import mekanism.common.Mekanism;
@@ -118,6 +119,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
tileEntity.tier = EnergyCubeTier.values()[getBaseTier(stack).ordinal()];
tileEntity.electricityStored = getEnergy(stack);
if(tileEntity.tier == EnergyCubeTier.CREATIVE)
{
tileEntity.configComponent.fillConfig(TransmissionType.ENERGY, tileEntity.getEnergy() > 0 ? 2 : 1);
}
if(tileEntity instanceof ISecurityTile)
{
ISecurityTile security = (ISecurityTile)tileEntity;
@@ -36,7 +36,7 @@ import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
@InterfaceList({
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "Tesla")
@Interface(iface = "net.darkhax.tesla.api.ITeslaConsumer", modid = "tesla")
})
public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, EnergyNetwork> implements IStrictEnergyAcceptor, IEnergyReceiver, IEnergyProvider, ITeslaConsumer
{
@@ -232,6 +232,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
factory.recipeType = recipeType;
factory.upgradeComponent.setSupported(Upgrade.GAS, recipeType.fuelEnergyUpgrades());
factory.securityComponent.readFrom(securityComponent);
factory.infuseStored = infuseStored;
for(int i = 0; i < tier.processes+5; i++)
{
@@ -255,8 +255,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
}
//Infuser
factory.infuseStored.amount = infuseStored.amount;
factory.infuseStored.type = infuseStored.type;
factory.infuseStored = infuseStored;
factory.inventory[5] = inventory[2];
factory.inventory[1] = inventory[4];
@@ -115,10 +115,12 @@ public class TileEntityThermalEvaporationController extends TileEntityThermalEva
{
int outputNeeded = outputTank.getCapacity()-outputTank.getFluidAmount();
int inputStored = inputTank.getFluidAmount();
double outputRatio = (double)recipe.recipeOutput.output.amount/(double)recipe.recipeInput.ingredient.amount;
double tempMult = Math.max(0, getTemperature())*general.evaporationTempMultiplier;
double inputToUse = (tempMult*recipe.recipeInput.ingredient.amount)*((float)height/(float)MAX_HEIGHT);
inputToUse = Math.min(inputTank.getFluidAmount(), inputToUse);
inputToUse = Math.min(inputToUse, outputNeeded/outputRatio);
lastGain = (float)inputToUse/(float)recipe.recipeInput.ingredient.amount;
partialInput += inputToUse;
@@ -51,7 +51,7 @@ public final class ChargeUtils
storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_RF));
}
else if(inv.getStackInSlot(slotID).getItem() == Items.REDSTONE && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy())
else if(inv.getStackInSlot(slotID).getItem() == Items.REDSTONE && storer.getEnergy()+general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy())
{
storer.setEnergy(storer.getEnergy() + general.ENERGY_PER_REDSTONE);
inv.getStackInSlot(slotID).stackSize--;
@@ -155,7 +155,7 @@ public final class ChargeUtils
return energyContainer.extractEnergy(itemstack, 1, true) > 0;
}
}
else if(itemstack.getItem() instanceof ISpecialElectricItem)
else if(MekanismUtils.useIC2() && itemstack.getItem() instanceof ISpecialElectricItem)
{
IElectricItemManager manager = ((ISpecialElectricItem)itemstack.getItem()).getManager(itemstack);
@@ -1366,7 +1366,9 @@ public final class MekanismUtils
return new ItemStack(dmgItems[0].getItem(), 1, solve);
}
for(IRecipe recipe : (List<IRecipe>)CraftingManager.getInstance().getRecipeList())
List<IRecipe> list = (List<IRecipe>)((ArrayList<IRecipe>)CraftingManager.getInstance().getRecipeList()).clone();
for(IRecipe recipe : list)
{
if(recipe.matches(inv, world))
{
@@ -1501,15 +1503,17 @@ public final class MekanismUtils
return true;
}
if(isBCWrench(tool.getItem()) && ((IToolWrench)tool.getItem()).canWrench(player, pos))
{
return true;
}
if(isCoFHHammer(tool.getItem()) && ((IToolHammer)tool.getItem()).isUsable(tool, player, pos))
{
return true;
}
try {
if(isBCWrench(tool.getItem()) && ((IToolWrench)tool.getItem()).canWrench(player, pos))
{
return true;
}
if(isCoFHHammer(tool.getItem()) && ((IToolHammer)tool.getItem()).isUsable(tool, player, pos))
{
return true;
}
} catch(Throwable t) {}
return false;
}
@@ -21,7 +21,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
@@ -130,11 +129,7 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo
Tessellator tessellator = Tessellator.getInstance();
VertexFormat prevFormat = null;
if(MekanismRenderer.isDrawing(tessellator))
{
prevFormat = tessellator.getBuffer().getVertexFormat();
tessellator.draw();
}
MekanismRenderer.pauseRenderer(tessellator);
List<BakedQuad> generalQuads = new LinkedList<BakedQuad>();
@@ -150,11 +145,7 @@ public class BakedGeneratorItemModel implements IBakedModel, IPerspectiveAwareMo
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.popMatrix();
if(prevFormat != null)
{
VertexBuffer worldrenderer = tessellator.getBuffer();
worldrenderer.begin(7, prevFormat);
}
MekanismRenderer.resumeRenderer(tessellator);
if(Block.getBlockFromItem(stack.getItem()) != null)
{
@@ -44,7 +44,7 @@ import net.minecraftforge.oredict.OreDictionary;
import buildcraft.api.fuels.BuildcraftFuelRegistry;
import buildcraft.api.fuels.IFuel;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
public class MekanismGenerators implements IModule
{
@SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy")
@@ -54,7 +54,7 @@ public class MekanismGenerators implements IModule
public static MekanismGenerators instance;
/** MekanismGenerators version number */
public static Version versionNumber = new Version(9, 1, 0);
public static Version versionNumber = new Version(9, 1, 1);
public static MultiblockManager<SynchronizedTurbineData> turbineManager = new MultiblockManager<SynchronizedTurbineData>("industrialTurbine");
@@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
{
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
@@ -42,7 +42,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(9, 1, 0);
public static Version versionNumber = new Version(9, 1, 1);
//Enums: Tools
public static ToolMaterial toolOBSIDIAN;
@@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:digital_miner"
"model": "mekanism:nothing"
},
"variants": {
"normal": [{}],
@@ -1,7 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:resistive_heater"
"model": "mekanism:nothing"
},
"variants": {
"facing": {
@@ -1,736 +0,0 @@
{
"elements": [
{
"__comment": "supportBeam2",
"from": [26, 2, 22],
"to": [30, 30, 30],
"faces": {
"down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"},
"up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"},
"north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"},
"south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"},
"west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"},
"east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"}
}
},
{
"__comment": "supportBeam1",
"from": [26, 2, -7],
"to": [30, 30, 1],
"faces": {
"down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"},
"up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"},
"north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"},
"south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"},
"west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"},
"east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"}
}
},
{
"__comment": "keyboardSupportExt2",
"from": [10, 9, -14],
"to": [11, 10, -13],
"faces": {
"down": {"uv": [8.8125, 1.625, 8.75, 1.6875], "texture": "#all"},
"up": {"uv": [8.75, 1.6875, 8.6875, 1.625], "texture": "#all"},
"north": {"uv": [8.6875, 1.6875, 8.75, 1.75], "texture": "#all"},
"south": {"uv": [8.8125, 1.6875, 8.875, 1.75], "texture": "#all"},
"west": {"uv": [8.75, 1.6875, 8.8125, 1.75], "texture": "#all"},
"east": {"uv": [8.625, 1.6875, 8.6875, 1.75], "texture": "#all"}
}
},
{
"__comment": "powerCable3",
"from": [22, 5, 5],
"to": [31, 11, 11],
"faces": {
"down": {"uv": [4.125, 6.8125, 3.5625, 7.1875], "texture": "#all"},
"up": {"uv": [3.5625, 7.1875, 3, 6.8125], "texture": "#all"},
"north": {"uv": [3, 7.1875, 3.5625, 7.5625], "texture": "#all"},
"south": {"uv": [3.9375, 7.1875, 4.5, 7.5625], "texture": "#all"},
"west": {"uv": [3.5625, 7.1875, 3.9375, 7.5625], "texture": "#all"},
"east": {"uv": [2.625, 7.1875, 3, 7.5625], "texture": "#all"}
}
},
{
"__comment": "foot4",
"from": [-15, 0, -8],
"to": [-8, 2, 2],
"faces": {
"down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"},
"up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"},
"north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"},
"south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"},
"west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"},
"east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"}
}
},
{
"__comment": "powerConnector2b",
"from": [-9, 4, 4],
"to": [-8, 12, 12],
"faces": {
"down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"},
"up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"},
"north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"},
"south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"},
"west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"},
"east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"}
}
},
{
"__comment": "frame2c",
"from": [-8, 15, 4],
"to": [24, 20, 19],
"faces": {
"down": {"uv": [12.8125, 3.125, 10.8125, 4.0625], "texture": "#all"},
"up": {"uv": [10.8125, 4.0625, 8.8125, 3.125], "texture": "#all"},
"north": {"uv": [8.8125, 4.0625, 10.8125, 4.375], "texture": "#all"},
"south": {"uv": [11.75, 4.0625, 13.75, 4.375], "texture": "#all"},
"west": {"uv": [10.8125, 4.0625, 11.75, 4.375], "texture": "#all"},
"east": {"uv": [7.875, 4.0625, 8.8125, 4.375], "texture": "#all"}
}
},
{
"__comment": "frame1",
"from": [-8, 3, -9],
"to": [24, 32, 3],
"faces": {
"down": {"uv": [4.75, 0, 2.75, 0.75], "texture": "#all"},
"up": {"uv": [2.75, 0.75, 0.75, 0], "texture": "#all"},
"north": {"uv": [0.75, 0.75, 2.75, 2.5625], "texture": "#all"},
"south": {"uv": [3.5, 0.75, 5.5, 2.5625], "texture": "#all"},
"west": {"uv": [2.75, 0.75, 3.5, 2.5625], "texture": "#all"},
"east": {"uv": [0, 0.75, 0.75, 2.5625], "texture": "#all"}
}
},
{
"__comment": "foot1",
"from": [24, 0, -8],
"to": [31, 2, 2],
"faces": {
"down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"},
"up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"},
"north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"},
"south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"},
"west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"},
"east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"}
}
},
{
"__comment": "bracket4",
"from": [24, 24, 29],
"to": [29, 29, 31],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "powerCpnnector3a",
"from": [31, 4, 4],
"to": [32, 12, 12],
"faces": {
"down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"},
"up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"},
"north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"},
"south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"},
"west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"},
"east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"}
}
},
{
"__comment": "led2",
"from": [2, 15.533333, -12.9],
"to": [3, 16.533333, -11.9],
"faces": {
"down": {"uv": [0.1875, 0, 0.125, 0.0625], "texture": "#all"},
"up": {"uv": [0.125, 0.0625, 0.0625, 0], "texture": "#all"},
"north": {"uv": [0.0625, 0.0625, 0.125, 0.125], "texture": "#all"},
"south": {"uv": [0.1875, 0.0625, 0.25, 0.125], "texture": "#all"},
"west": {"uv": [0.125, 0.0625, 0.1875, 0.125], "texture": "#all"},
"east": {"uv": [0, 0.0625, 0.0625, 0.125], "texture": "#all"}
}
},
{
"__comment": "powerCable1b",
"from": [5, 1, 5],
"to": [11, 4, 11],
"faces": {
"down": {"uv": [7, 3.25, 6.625, 3.625], "texture": "#all"},
"up": {"uv": [6.625, 3.625, 6.25, 3.25], "texture": "#all"},
"north": {"uv": [6.25, 3.625, 6.625, 3.8125], "texture": "#all"},
"south": {"uv": [7, 3.625, 7.375, 3.8125], "texture": "#all"},
"west": {"uv": [6.625, 3.625, 7, 3.8125], "texture": "#all"},
"east": {"uv": [5.875, 3.625, 6.25, 3.8125], "texture": "#all"}
}
},
{
"__comment": "led1",
"from": [17, 15.5, -12.9],
"to": [18, 16.5, -11.9],
"faces": {
"down": {"uv": [0.1875, 0, 0.125, 0.0625], "texture": "#all"},
"up": {"uv": [0.125, 0.0625, 0.0625, 0], "texture": "#all"},
"north": {"uv": [0.0625, 0.0625, 0.125, 0.125], "texture": "#all"},
"south": {"uv": [0.1875, 0.0625, 0.25, 0.125], "texture": "#all"},
"west": {"uv": [0.125, 0.0625, 0.1875, 0.125], "texture": "#all"},
"east": {"uv": [0, 0.0625, 0.0625, 0.125], "texture": "#all"}
}
},
{
"__comment": "monitor1",
"from": [16, 16, -13],
"to": [30, 26, -11],
"faces": {
"down": {"uv": [7.375, 1.25, 6.5, 1.375], "texture": "#all"},
"up": {"uv": [6.5, 1.375, 5.625, 1.25], "texture": "#all"},
"north": {"uv": [5.625, 1.375, 6.5, 2], "texture": "#all"},
"south": {"uv": [6.625, 1.375, 7.5, 2], "texture": "#all"},
"west": {"uv": [6.5, 1.375, 6.625, 2], "texture": "#all"},
"east": {"uv": [5.5, 1.375, 5.625, 2], "texture": "#all"}
}
},
{
"__comment": "foot2",
"from": [24, 0, 21],
"to": [31, 2, 31],
"faces": {
"down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"},
"up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"},
"north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"},
"south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"},
"west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"},
"east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"}
}
},
{
"__comment": "monitorBar1",
"from": [13.5, 20, -11.2],
"to": [17.5, 22, -10.2],
"faces": {
"down": {"uv": [7.6875, 2.25, 7.4375, 2.3125], "texture": "#all"},
"up": {"uv": [7.4375, 2.3125, 7.1875, 2.25], "texture": "#all"},
"north": {"uv": [7.1875, 2.3125, 7.4375, 2.4375], "texture": "#all"},
"south": {"uv": [7.5, 2.3125, 7.75, 2.4375], "texture": "#all"},
"west": {"uv": [7.4375, 2.3125, 7.5, 2.4375], "texture": "#all"},
"east": {"uv": [7.125, 2.3125, 7.1875, 2.4375], "texture": "#all"}
}
},
{
"__comment": "monitor2",
"from": [1, 16, -13],
"to": [15, 26, -11],
"faces": {
"down": {"uv": [7.375, 1.25, 6.5, 1.375], "texture": "#all"},
"up": {"uv": [6.5, 1.375, 5.625, 1.25], "texture": "#all"},
"north": {"uv": [5.625, 1.375, 6.5, 2], "texture": "#all"},
"south": {"uv": [6.625, 1.375, 7.5, 2], "texture": "#all"},
"west": {"uv": [6.5, 1.375, 6.625, 2], "texture": "#all"},
"east": {"uv": [5.5, 1.375, 5.625, 2], "texture": "#all"}
}
},
{
"__comment": "powerCable1a",
"from": [5, 2, -6],
"to": [11, 4, 5],
"faces": {
"down": {"uv": [6.9375, 2.4375, 6.5625, 3.125], "texture": "#all"},
"up": {"uv": [6.5625, 3.125, 6.1875, 2.4375], "texture": "#all"},
"north": {"uv": [6.1875, 3.125, 6.5625, 3.25], "texture": "#all"},
"south": {"uv": [7.25, 3.125, 7.625, 3.25], "texture": "#all"},
"west": {"uv": [6.5625, 3.125, 7.25, 3.25], "texture": "#all"},
"east": {"uv": [5.5, 3.125, 6.1875, 3.25], "texture": "#all"}
}
},
{
"__comment": "core",
"from": [-7, 4, 3],
"to": [23, 31, 20],
"faces": {
"down": {"uv": [4.8125, 2.5625, 2.9375, 3.625], "texture": "#all"},
"up": {"uv": [2.9375, 3.625, 1.0625, 2.5625], "texture": "#all"},
"north": {"uv": [1.0625, 3.625, 2.9375, 5.3125], "texture": "#all"},
"south": {"uv": [4, 3.625, 5.875, 5.3125], "texture": "#all"},
"west": {"uv": [2.9375, 3.625, 4, 5.3125], "texture": "#all"},
"east": {"uv": [0, 3.625, 1.0625, 5.3125], "texture": "#all"}
}
},
{
"__comment": "bracketPlate3",
"from": [-9, 24, -6],
"to": [-8, 29, 0],
"faces": {
"down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"},
"up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"},
"north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"},
"south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"},
"west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"},
"east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"}
}
},
{
"__comment": "keyboardBottom",
"from": [4, 8.5, -13.5],
"to": [12, 12.5, -12.5],
"faces": {
"down": {"uv": [8.5625, 1.625, 8.0625, 1.6875], "texture": "#all"},
"up": {"uv": [8.0625, 1.6875, 7.5625, 1.625], "texture": "#all"},
"north": {"uv": [7.5625, 1.6875, 8.0625, 1.9375], "texture": "#all"},
"south": {"uv": [8.125, 1.6875, 8.625, 1.9375], "texture": "#all"},
"west": {"uv": [8.0625, 1.6875, 8.125, 1.9375], "texture": "#all"},
"east": {"uv": [7.5, 1.6875, 7.5625, 1.9375], "texture": "#all"}
}
},
{
"__comment": "bracket3",
"from": [24, 24, 21],
"to": [29, 29, 23],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "monitorMount1",
"from": [10, 20, -11],
"to": [12, 22, -9],
"faces": {
"down": {"uv": [7.5, 2, 7.375, 2.125], "texture": "#all"},
"up": {"uv": [7.375, 2.125, 7.25, 2], "texture": "#all"},
"north": {"uv": [7.25, 2.125, 7.375, 2.25], "texture": "#all"},
"south": {"uv": [7.5, 2.125, 7.625, 2.25], "texture": "#all"},
"west": {"uv": [7.375, 2.125, 7.5, 2.25], "texture": "#all"},
"east": {"uv": [7.125, 2.125, 7.25, 2.25], "texture": "#all"}
}
},
{
"__comment": "monitor3back",
"from": [-13, 18, -11],
"to": [-1, 24, -10],
"faces": {
"down": {"uv": [7.0625, 2, 6.3125, 2.0625], "texture": "#all"},
"up": {"uv": [6.3125, 2.0625, 5.5625, 2], "texture": "#all"},
"north": {"uv": [5.5625, 2.0625, 6.3125, 2.4375], "texture": "#all"},
"south": {"uv": [6.375, 2.0625, 7.125, 2.4375], "texture": "#all"},
"west": {"uv": [6.3125, 2.0625, 6.375, 2.4375], "texture": "#all"},
"east": {"uv": [5.5, 2.0625, 5.5625, 2.4375], "texture": "#all"}
}
},
{
"__comment": "bracket2",
"from": [24, 24, 0],
"to": [29, 29, 2],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "foot3",
"from": [-15, 0, 21],
"to": [-8, 2, 31],
"faces": {
"down": {"uv": [4.25, 5.3125, 3.8125, 5.9375], "texture": "#all"},
"up": {"uv": [3.8125, 5.9375, 3.375, 5.3125], "texture": "#all"},
"north": {"uv": [3.375, 5.9375, 3.8125, 6.0625], "texture": "#all"},
"south": {"uv": [4.4375, 5.9375, 4.875, 6.0625], "texture": "#all"},
"west": {"uv": [3.8125, 5.9375, 4.4375, 6.0625], "texture": "#all"},
"east": {"uv": [2.75, 5.9375, 3.375, 6.0625], "texture": "#all"}
}
},
{
"__comment": "keyboardSupport1",
"from": [10, 9, -13],
"to": [11, 11, -9],
"faces": {
"down": {"uv": [9.25, 1.25, 9.1875, 1.5], "texture": "#all"},
"up": {"uv": [9.1875, 1.5, 9.125, 1.25], "texture": "#all"},
"north": {"uv": [9.125, 1.5, 9.1875, 1.625], "texture": "#all"},
"south": {"uv": [9.4375, 1.5, 9.5, 1.625], "texture": "#all"},
"west": {"uv": [9.1875, 1.5, 9.4375, 1.625], "texture": "#all"},
"east": {"uv": [8.875, 1.5, 9.125, 1.625], "texture": "#all"}
}
},
{
"__comment": "bracketPlate2",
"from": [24, 24, 23],
"to": [25, 29, 29],
"faces": {
"down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"},
"up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"},
"north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"},
"south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"},
"west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"},
"east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"}
}
},
{
"__comment": "powerConnector1",
"from": [4, 0, 4],
"to": [12, 1, 12],
"faces": {
"down": {"uv": [7.375, 3.8125, 6.875, 4.3125], "texture": "#all"},
"up": {"uv": [6.875, 4.3125, 6.375, 3.8125], "texture": "#all"},
"north": {"uv": [6.375, 4.3125, 6.875, 4.375], "texture": "#all"},
"south": {"uv": [7.375, 4.3125, 7.875, 4.375], "texture": "#all"},
"west": {"uv": [6.875, 4.3125, 7.375, 4.375], "texture": "#all"},
"east": {"uv": [5.875, 4.3125, 6.375, 4.375], "texture": "#all"}
}
},
{
"__comment": "bracketPlate1",
"from": [24, 24, -6],
"to": [25, 29, 0],
"faces": {
"down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"},
"up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"},
"north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"},
"south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"},
"west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"},
"east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"}
}
},
{
"__comment": "monitorMount2",
"from": [4, 20, -11],
"to": [6, 22, -9],
"faces": {
"down": {"uv": [7.5, 2, 7.375, 2.125], "texture": "#all"},
"up": {"uv": [7.375, 2.125, 7.25, 2], "texture": "#all"},
"north": {"uv": [7.25, 2.125, 7.375, 2.25], "texture": "#all"},
"south": {"uv": [7.5, 2.125, 7.625, 2.25], "texture": "#all"},
"west": {"uv": [7.375, 2.125, 7.5, 2.25], "texture": "#all"},
"east": {"uv": [7.125, 2.125, 7.25, 2.25], "texture": "#all"}
}
},
{
"__comment": "powerConnector3b",
"from": [24, 4, 4],
"to": [25, 12, 12],
"faces": {
"down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"},
"up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"},
"north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"},
"south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"},
"west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"},
"east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"}
}
},
{
"__comment": "frame2a",
"from": [-8, 27, 4],
"to": [24, 32, 19],
"faces": {
"down": {"uv": [10.4375, 0, 8.4375, 0.9375], "texture": "#all"},
"up": {"uv": [8.4375, 0.9375, 6.4375, 0], "texture": "#all"},
"north": {"uv": [6.4375, 0.9375, 8.4375, 1.25], "texture": "#all"},
"south": {"uv": [9.375, 0.9375, 11.375, 1.25], "texture": "#all"},
"west": {"uv": [8.4375, 0.9375, 9.375, 1.25], "texture": "#all"},
"east": {"uv": [5.5, 0.9375, 6.4375, 1.25], "texture": "#all"}
}
},
{
"__comment": "bracket5",
"from": [-13, 24, -8],
"to": [-8, 29, -6],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "keyboard",
"from": [3, 8, -14],
"to": [13, 13, -13],
"faces": {
"down": {"uv": [8.8125, 1.25, 8.1875, 1.3125], "texture": "#all"},
"up": {"uv": [8.1875, 1.3125, 7.5625, 1.25], "texture": "#all"},
"north": {"uv": [7.5625, 1.3125, 8.1875, 1.625], "texture": "#all"},
"south": {"uv": [8.25, 1.3125, 8.875, 1.625], "texture": "#all"},
"west": {"uv": [8.1875, 1.3125, 8.25, 1.625], "texture": "#all"},
"east": {"uv": [7.5, 1.3125, 7.5625, 1.625], "texture": "#all"}
}
},
{
"__comment": "bracketPlate4",
"from": [-9, 24, 23],
"to": [-8, 29, 29],
"faces": {
"down": {"uv": [2.375, 5.3125, 2.3125, 5.6875], "texture": "#all"},
"up": {"uv": [2.3125, 5.6875, 2.25, 5.3125], "texture": "#all"},
"north": {"uv": [2.25, 5.6875, 2.3125, 6], "texture": "#all"},
"south": {"uv": [2.6875, 5.6875, 2.75, 6], "texture": "#all"},
"west": {"uv": [2.3125, 5.6875, 2.6875, 6], "texture": "#all"},
"east": {"uv": [1.875, 5.6875, 2.25, 6], "texture": "#all"}
}
},
{
"__comment": "monitorBar2",
"from": [-1.5, 20, -11.2],
"to": [2.5, 22, -10.2],
"faces": {
"down": {"uv": [7.6875, 2.25, 7.4375, 2.3125], "texture": "#all"},
"up": {"uv": [7.4375, 2.3125, 7.1875, 2.25], "texture": "#all"},
"north": {"uv": [7.1875, 2.3125, 7.4375, 2.4375], "texture": "#all"},
"south": {"uv": [7.5, 2.3125, 7.75, 2.4375], "texture": "#all"},
"west": {"uv": [7.4375, 2.3125, 7.5, 2.4375], "texture": "#all"},
"east": {"uv": [7.125, 2.3125, 7.1875, 2.4375], "texture": "#all"}
}
},
{
"__comment": "monitor1back",
"from": [17, 18, -11],
"to": [29, 24, -10],
"faces": {
"down": {"uv": [7.0625, 2, 6.3125, 2.0625], "texture": "#all"},
"up": {"uv": [6.3125, 2.0625, 5.5625, 2], "texture": "#all"},
"north": {"uv": [5.5625, 2.0625, 6.3125, 2.4375], "texture": "#all"},
"south": {"uv": [6.375, 2.0625, 7.125, 2.4375], "texture": "#all"},
"west": {"uv": [6.3125, 2.0625, 6.375, 2.4375], "texture": "#all"},
"east": {"uv": [5.5, 2.0625, 5.5625, 2.4375], "texture": "#all"}
}
},
{
"__comment": "bracket8",
"from": [-13, 24, 29],
"to": [-8, 29, 31],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "led3",
"from": [-13, 15.5, -12.9],
"to": [-12, 16.5, -11.9],
"faces": {
"down": {"uv": [0.1875, 0, 0.125, 0.0625], "texture": "#all"},
"up": {"uv": [0.125, 0.0625, 0.0625, 0], "texture": "#all"},
"north": {"uv": [0.0625, 0.0625, 0.125, 0.125], "texture": "#all"},
"south": {"uv": [0.1875, 0.0625, 0.25, 0.125], "texture": "#all"},
"west": {"uv": [0.125, 0.0625, 0.1875, 0.125], "texture": "#all"},
"east": {"uv": [0, 0.0625, 0.0625, 0.125], "texture": "#all"}
}
},
{
"__comment": "plate5",
"from": [-8, 3, 4],
"to": [24, 8, 19],
"faces": {
"down": {"uv": [10.4375, 5.625, 8.4375, 6.5625], "texture": "#all"},
"up": {"uv": [8.4375, 6.5625, 6.4375, 5.625], "texture": "#all"},
"north": {"uv": [6.4375, 6.5625, 8.4375, 6.875], "texture": "#all"},
"south": {"uv": [9.375, 6.5625, 11.375, 6.875], "texture": "#all"},
"west": {"uv": [8.4375, 6.5625, 9.375, 6.875], "texture": "#all"},
"east": {"uv": [5.5, 6.5625, 6.4375, 6.875], "texture": "#all"}
}
},
{
"__comment": "bracket7",
"from": [-13, 24, 21],
"to": [-8, 29, 23],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "supportBeam3",
"from": [-14, 2, -7],
"to": [-10, 30, 1],
"faces": {
"down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"},
"up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"},
"north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"},
"south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"},
"west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"},
"east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"}
}
},
{
"__comment": "powerConnector2a",
"from": [-16, 4, 4],
"to": [-15, 12, 12],
"faces": {
"down": {"uv": [2.125, 6.5625, 2.0625, 7.0625], "texture": "#all"},
"up": {"uv": [2.0625, 7.0625, 2, 6.5625], "texture": "#all"},
"north": {"uv": [2, 7.0625, 2.0625, 7.5625], "texture": "#all"},
"south": {"uv": [2.5625, 7.0625, 2.625, 7.5625], "texture": "#all"},
"west": {"uv": [2.0625, 7.0625, 2.5625, 7.5625], "texture": "#all"},
"east": {"uv": [1.5, 7.0625, 2, 7.5625], "texture": "#all"}
}
},
{
"__comment": "keyboardSupport2",
"from": [5, 9, -13],
"to": [6, 11, -9],
"faces": {
"down": {"uv": [9.25, 1.25, 9.1875, 1.5], "texture": "#all"},
"up": {"uv": [9.1875, 1.5, 9.125, 1.25], "texture": "#all"},
"north": {"uv": [9.125, 1.5, 9.1875, 1.625], "texture": "#all"},
"south": {"uv": [9.4375, 1.5, 9.5, 1.625], "texture": "#all"},
"west": {"uv": [9.1875, 1.5, 9.4375, 1.625], "texture": "#all"},
"east": {"uv": [8.875, 1.5, 9.125, 1.625], "texture": "#all"}
}
},
{
"__comment": "powerCable2",
"from": [-15, 5, 5],
"to": [-6, 11, 11],
"faces": {
"down": {"uv": [4.125, 6.8125, 3.5625, 7.1875], "texture": "#all"},
"up": {"uv": [3.5625, 7.1875, 3, 6.8125], "texture": "#all"},
"north": {"uv": [3, 7.1875, 3.5625, 7.5625], "texture": "#all"},
"south": {"uv": [3.9375, 7.1875, 4.5, 7.5625], "texture": "#all"},
"west": {"uv": [3.5625, 7.1875, 3.9375, 7.5625], "texture": "#all"},
"east": {"uv": [2.625, 7.1875, 3, 7.5625], "texture": "#all"}
}
},
{
"__comment": "monitor2back",
"from": [2, 18, -11],
"to": [14, 24, -10],
"faces": {
"down": {"uv": [7.0625, 2, 6.3125, 2.0625], "texture": "#all"},
"up": {"uv": [6.3125, 2.0625, 5.5625, 2], "texture": "#all"},
"north": {"uv": [5.5625, 2.0625, 6.3125, 2.4375], "texture": "#all"},
"south": {"uv": [6.375, 2.0625, 7.125, 2.4375], "texture": "#all"},
"west": {"uv": [6.3125, 2.0625, 6.375, 2.4375], "texture": "#all"},
"east": {"uv": [5.5, 2.0625, 5.5625, 2.4375], "texture": "#all"}
}
},
{
"__comment": "bracket6",
"from": [-13, 24, 0],
"to": [-8, 29, 2],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "monitor3",
"from": [-14, 16, -13],
"to": [0, 26, -11],
"faces": {
"down": {"uv": [7.375, 1.25, 6.5, 1.375], "texture": "#all"},
"up": {"uv": [6.5, 1.375, 5.625, 1.25], "texture": "#all"},
"north": {"uv": [5.625, 1.375, 6.5, 2], "texture": "#all"},
"south": {"uv": [6.625, 1.375, 7.5, 2], "texture": "#all"},
"west": {"uv": [6.5, 1.375, 6.625, 2], "texture": "#all"},
"east": {"uv": [5.5, 1.375, 5.625, 2], "texture": "#all"}
}
},
{
"__comment": "keyboardSupportExt1",
"from": [5, 9, -14],
"to": [6, 10, -13],
"faces": {
"down": {"uv": [8.8125, 1.625, 8.75, 1.6875], "texture": "#all"},
"up": {"uv": [8.75, 1.6875, 8.6875, 1.625], "texture": "#all"},
"north": {"uv": [8.6875, 1.6875, 8.75, 1.75], "texture": "#all"},
"south": {"uv": [8.8125, 1.6875, 8.875, 1.75], "texture": "#all"},
"west": {"uv": [8.75, 1.6875, 8.8125, 1.75], "texture": "#all"},
"east": {"uv": [8.625, 1.6875, 8.6875, 1.75], "texture": "#all"}
}
},
{
"__comment": "frame2b",
"from": [-8, 21, 4],
"to": [24, 26, 19],
"faces": {
"down": {"uv": [12.8125, 3.125, 10.8125, 4.0625], "texture": "#all"},
"up": {"uv": [10.8125, 4.0625, 8.8125, 3.125], "texture": "#all"},
"north": {"uv": [8.8125, 4.0625, 10.8125, 4.375], "texture": "#all"},
"south": {"uv": [11.75, 4.0625, 13.75, 4.375], "texture": "#all"},
"west": {"uv": [10.8125, 4.0625, 11.75, 4.375], "texture": "#all"},
"east": {"uv": [7.875, 4.0625, 8.8125, 4.375], "texture": "#all"}
}
},
{
"__comment": "supportBeam4",
"from": [-14, 2, 22],
"to": [-10, 30, 30],
"faces": {
"down": {"uv": [1, 5.3125, 0.75, 5.8125], "texture": "#all"},
"up": {"uv": [0.75, 5.8125, 0.5, 5.3125], "texture": "#all"},
"north": {"uv": [0.5, 5.8125, 0.75, 7.5625], "texture": "#all"},
"south": {"uv": [1.25, 5.8125, 1.5, 7.5625], "texture": "#all"},
"west": {"uv": [0.75, 5.8125, 1.25, 7.5625], "texture": "#all"},
"east": {"uv": [0, 5.8125, 0.5, 7.5625], "texture": "#all"}
}
},
{
"__comment": "bracket1",
"from": [24, 24, -8],
"to": [29, 29, -6],
"faces": {
"down": {"uv": [1.75, 5.3125, 1.4375, 5.4375], "texture": "#all"},
"up": {"uv": [1.4375, 5.4375, 1.125, 5.3125], "texture": "#all"},
"north": {"uv": [1.125, 5.4375, 1.4375, 5.75], "texture": "#all"},
"south": {"uv": [1.5625, 5.4375, 1.875, 5.75], "texture": "#all"},
"west": {"uv": [1.4375, 5.4375, 1.5625, 5.75], "texture": "#all"},
"east": {"uv": [1, 5.4375, 1.125, 5.75], "texture": "#all"}
}
},
{
"__comment": "frame2d",
"from": [-8, 9, 4],
"to": [24, 14, 19],
"faces": {
"down": {"uv": [10.4375, 4.375, 8.4375, 5.3125], "texture": "#all"},
"up": {"uv": [8.4375, 5.3125, 6.4375, 4.375], "texture": "#all"},
"north": {"uv": [6.4375, 5.3125, 8.4375, 5.625], "texture": "#all"},
"south": {"uv": [9.375, 5.3125, 11.375, 5.625], "texture": "#all"},
"west": {"uv": [8.4375, 5.3125, 9.375, 5.625], "texture": "#all"},
"east": {"uv": [5.5, 5.3125, 6.4375, 5.625], "texture": "#all"}
}
},
{
"__comment": "frame3",
"from": [-8, 3, 20],
"to": [24, 32, 32],
"faces": {
"down": {"uv": [4.75, 0, 2.75, 0.75], "texture": "#all"},
"up": {"uv": [2.75, 0.75, 0.75, 0], "texture": "#all"},
"north": {"uv": [0.75, 0.75, 2.75, 2.5625], "texture": "#all"},
"south": {"uv": [3.5, 0.75, 5.5, 2.5625], "texture": "#all"},
"west": {"uv": [2.75, 0.75, 3.5, 2.5625], "texture": "#all"},
"east": {"uv": [0, 0.75, 0.75, 2.5625], "texture": "#all"}
}
}
],
"textures": {
"all": "mekanism:blocks/models/digital_miner",
"particle": "mekanism:blocks/SteelCasing"
}
}
@@ -1,268 +0,0 @@
{
"elements": [
{
"__comment": "wallRight",
"from": [13, 7, 0],
"to": [16, 16, 16],
"faces": {
"down": {"uv": [2.75, 2.875, 2.375, 4.875], "texture": "#all"},
"up": {"uv": [2.375, 4.875, 2, 2.875], "texture": "#all"},
"north": {"uv": [2, 4.875, 2.375, 6], "texture": "#all"},
"south": {"uv": [4.375, 4.875, 4.75, 6], "texture": "#all"},
"west": {"uv": [2.375, 4.875, 4.375, 6], "texture": "#all"},
"east": {"uv": [0, 4.875, 2, 6], "texture": "#all"}
}
},
{
"__comment": "portLeft",
"from": [-0.00999999999999979, 4, 4],
"to": [0.99, 12, 12],
"faces": {
"down": {"uv": [7.25, 0, 7.125, 1], "texture": "#all"},
"up": {"uv": [7.125, 1, 7, 0], "texture": "#all"},
"north": {"uv": [7, 1, 7.125, 2], "texture": "#all"},
"south": {"uv": [8.125, 1, 8.25, 2], "texture": "#all"},
"west": {"uv": [7.125, 1, 8.125, 2], "texture": "#all"},
"east": {"uv": [6, 1, 7, 2], "texture": "#all"}
}
},
{
"__comment": "bar4",
"from": [4, 13.5, 1.5],
"to": [5, 14.5, 14.5],
"faces": {
"down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"},
"up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"},
"north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"},
"south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"},
"west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"},
"east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"}
}
},
{
"__comment": "base",
"from": [0, 0, 0],
"to": [16, 7, 16],
"faces": {
"down": {"uv": [6, 0, 4, 2], "texture": "#all"},
"up": {"uv": [4, 2, 2, 0], "texture": "#all"},
"north": {"uv": [2, 2, 4, 2.875], "texture": "#all"},
"south": {"uv": [6, 2, 8, 2.875], "texture": "#all"},
"west": {"uv": [4, 2, 6, 2.875], "texture": "#all"},
"east": {"uv": [0, 2, 2, 2.875], "texture": "#all"}
}
},
{
"__comment": "fin1",
"from": [3, 6.5, 0.5],
"to": [13, 15.5, 1.5],
"faces": {
"down": {"uv": [5.375, 6, 4.125, 6.125], "texture": "#all"},
"up": {"uv": [4.125, 6.125, 2.875, 6], "texture": "#all"},
"north": {"uv": [2.875, 6.125, 4.125, 7.25], "texture": "#all"},
"south": {"uv": [4.25, 6.125, 5.5, 7.25], "texture": "#all"},
"west": {"uv": [4.125, 6.125, 4.25, 7.25], "texture": "#all"},
"east": {"uv": [2.75, 6.125, 2.875, 7.25], "texture": "#all"}
}
},
{
"__comment": "fin8",
"from": [3, 6.5, 11.5],
"to": [13, 15.5, 12.5],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "center",
"from": [5, 6.5, 7.5],
"to": [11, 12.5, 8.5],
"faces": {
"down": {"uv": [1.625, 0, 0.875, 0.125], "texture": "#all"},
"up": {"uv": [0.875, 0.125, 0.125, 0], "texture": "#all"},
"north": {"uv": [0.125, 0.125, 0.875, 0.875], "texture": "#all"},
"south": {"uv": [1, 0.125, 1.75, 0.875], "texture": "#all"},
"west": {"uv": [0.875, 0.125, 1, 0.875], "texture": "#all"},
"east": {"uv": [0, 0.125, 0.125, 0.875], "texture": "#all"}
}
},
{
"__comment": "fin10",
"from": [3, 6.5, 14.5],
"to": [13, 15.5, 15.5],
"faces": {
"down": {"uv": [7.375, 4.75, 6.125, 4.875], "texture": "#all"},
"up": {"uv": [6.125, 4.875, 4.875, 4.75], "texture": "#all"},
"north": {"uv": [4.875, 4.875, 6.125, 6], "texture": "#all"},
"south": {"uv": [6.25, 4.875, 7.5, 6], "texture": "#all"},
"west": {"uv": [6.125, 4.875, 6.25, 6], "texture": "#all"},
"east": {"uv": [4.75, 4.875, 4.875, 6], "texture": "#all"}
}
},
{
"__comment": "bar1",
"from": [11, 13.5, 1.5],
"to": [12, 14.5, 14.5],
"faces": {
"down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"},
"up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"},
"north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"},
"south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"},
"west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"},
"east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"}
}
},
{
"__comment": "portRight",
"from": [15.01, 4, 4],
"to": [16.01, 12, 12],
"faces": {
"down": {"uv": [7.25, 0, 7.125, 1], "texture": "#all"},
"up": {"uv": [7.125, 1, 7, 0], "texture": "#all"},
"north": {"uv": [7, 1, 7.125, 2], "texture": "#all"},
"south": {"uv": [8.125, 1, 8.25, 2], "texture": "#all"},
"west": {"uv": [7.125, 1, 8.125, 2], "texture": "#all"},
"east": {"uv": [6, 1, 7, 2], "texture": "#all"}
}
},
{
"__comment": "wallLeft",
"from": [0, 7, 0],
"to": [3, 16, 16],
"faces": {
"down": {"uv": [2.75, 2.875, 2.375, 4.875], "texture": "#all"},
"up": {"uv": [2.375, 4.875, 2, 2.875], "texture": "#all"},
"north": {"uv": [2, 4.875, 2.375, 6], "texture": "#all"},
"south": {"uv": [4.375, 4.875, 4.75, 6], "texture": "#all"},
"west": {"uv": [2.375, 4.875, 4.375, 6], "texture": "#all"},
"east": {"uv": [0, 4.875, 2, 6], "texture": "#all"}
}
},
{
"__comment": "fin5",
"from": [3, 6.5, 6.5],
"to": [13, 15.5, 7.5],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "fin3",
"from": [3, 6.5, 3.5],
"to": [13, 15.5, 4.5],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "fin4",
"from": [3, 6.5, 5],
"to": [13, 15.5, 6],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "fin9",
"from": [3, 6.5, 13],
"to": [13, 15.5, 14],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "fin2",
"from": [3, 6.5, 2],
"to": [13, 15.5, 3],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "bar2",
"from": [9, 13.5, 1.5],
"to": [10, 14.5, 14.5],
"faces": {
"down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"},
"up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"},
"north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"},
"south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"},
"west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"},
"east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"}
}
},
{
"__comment": "fin6",
"from": [3, 6.5, 8.5],
"to": [13, 15.5, 9.5],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "fin7",
"from": [3, 6.5, 10],
"to": [13, 15.5, 11],
"faces": {
"down": {"uv": [2.625, 6, 1.375, 6.125], "texture": "#all"},
"up": {"uv": [1.375, 6.125, 0.125, 6], "texture": "#all"},
"north": {"uv": [0.125, 6.125, 1.375, 7.25], "texture": "#all"},
"south": {"uv": [1.5, 6.125, 2.75, 7.25], "texture": "#all"},
"west": {"uv": [1.375, 6.125, 1.5, 7.25], "texture": "#all"},
"east": {"uv": [0, 6.125, 0.125, 7.25], "texture": "#all"}
}
},
{
"__comment": "bar3",
"from": [6, 13.5, 1.5],
"to": [7, 14.5, 14.5],
"faces": {
"down": {"uv": [6.375, 2.875, 6.25, 4.5], "texture": "#all"},
"up": {"uv": [6.25, 4.5, 6.125, 2.875], "texture": "#all"},
"north": {"uv": [6.125, 4.5, 6.25, 4.625], "texture": "#all"},
"south": {"uv": [7.875, 4.5, 8, 4.625], "texture": "#all"},
"west": {"uv": [6.25, 4.5, 7.875, 4.625], "texture": "#all"},
"east": {"uv": [4.5, 4.5, 6.125, 4.625], "texture": "#all"}
}
}
],
"textures": {
"all": "mekanism:blocks/models/resistive_heater",
"particle": "mekanism:blocks/SteelCasing"
}
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanism:items/Configurator"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/BronzeAxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/BronzeHoe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/BronzePaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/BronzePickaxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/BronzeShovel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/BronzeSword"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/DiamondPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GlowstoneAxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GlowstoneHoe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GlowstonePaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GlowstonePickaxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GlowstoneShovel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GlowstoneSword"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/GoldPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/IronPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/LapisLazuliAxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/LapisLazuliHoe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/LapisLazuliPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/LapisLazuliPickaxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/LapisLazuliShovel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/LapisLazuliSword"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/ObsidianAxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/ObsidianHoe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/ObsidianPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/ObsidianPickaxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/ObsidianShovel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/ObsidianSword"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/OsmiumAxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/OsmiumHoe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/OsmiumPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/OsmiumPickaxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/OsmiumShovel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/OsmiumSword"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/SteelAxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/SteelHoe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/SteelPaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/SteelPickaxe"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/SteelShovel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/SteelSword"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/StonePaxel"
}
@@ -1,5 +1,5 @@
{
"parent": "mekanism:item/standard_item",
"parent": "item/handheld",
"textures": {
"layer0": "mekanismtools:items/WoodPaxel"
}