diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java deleted file mode 100644 index 3defd9253..000000000 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ /dev/null @@ -1,210 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.client.render.model; - -import java.lang.reflect.Type; -import java.util.Collection; -import java.util.Set; -import java.util.function.Function; - -import javax.annotation.Nullable; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParseException; -import com.mojang.blaze3d.matrix.MatrixStack; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.BlockFaceUV; -import net.minecraft.client.renderer.model.BlockModel; -import net.minecraft.client.renderer.model.BlockPart; -import net.minecraft.client.renderer.model.BlockPartFace; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverride; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.ItemTransformVec3f; -import net.minecraft.client.renderer.model.ModelBakery; -import net.minecraft.client.renderer.model.RenderMaterial; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.resources.IResourceManager; -import net.minecraft.util.Direction; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.TransformationMatrix; -import net.minecraftforge.client.model.IModelBuilder; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.geometry.IModelGeometry; -import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; -import net.minecraftforge.client.model.pipeline.VertexLighterFlat; -import net.minecraftforge.common.model.TransformationHelper; - -public class UVLModelLoader implements IModelLoader { - - public static final UVLModelLoader INSTANCE = new UVLModelLoader(); - - @Override - public void onResourceManagerReload(IResourceManager resourceManager) { - } - - @Override - public UVLModelWrapper read(JsonDeserializationContext deserializationContext, JsonObject modelContents) { - modelContents.remove("loader"); - BlockModel blockModel = UVLSERIALIZER.fromJson(modelContents, BlockModel.class); - return new UVLModelWrapper(blockModel); - } - - final Gson UVLSERIALIZER = (new GsonBuilder()) - .registerTypeAdapter(BlockModel.class, new ModelLoaderRegistry.ExpandedBlockModelDeserializer()) - .registerTypeAdapter(BlockPart.class, new BlockPart.Deserializer()) - .registerTypeAdapter(BlockPartFace.class, new BlockPartFaceOverrideSerializer()) - .registerTypeAdapter(BlockFaceUV.class, new BlockFaceUV.Deserializer()) - .registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer()) - .registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer()) - .registerTypeAdapter(ItemOverride.class, new ItemOverride.Deserializer()) - .registerTypeAdapter(TransformationMatrix.class, new TransformationHelper.Deserializer()).create(); - - private static class BlockPartFaceOverrideSerializer extends BlockPartFace.Deserializer { - @Override - public BlockPartFace deserialize(JsonElement p_deserialize_1_, Type p_deserialize_2_, - JsonDeserializationContext p_deserialize_3_) throws JsonParseException { - BlockPartFace blockFace = super.deserialize(p_deserialize_1_, p_deserialize_2_, p_deserialize_3_); - Pair uvl = this.parseUVL(p_deserialize_1_.getAsJsonObject()); - if (uvl != null) { - return new BlockPartFaceWithUVL(blockFace.cullFace, blockFace.tintIndex, blockFace.texture, - blockFace.blockFaceUV, uvl.getLeft(), uvl.getRight()); - } - return blockFace; - } - - protected Pair parseUVL(JsonObject object) { - if (!object.has("uvlightmap")) { - return null; - } - object = object.get("uvlightmap").getAsJsonObject(); - return new ImmutablePair<>(JSONUtils.getFloat(object, "sky", 0), JSONUtils.getFloat(object, "block", 0)); - } - } - - private static class BlockPartFaceWithUVL extends BlockPartFace { - - private final float sky; - private final float block; - - public BlockPartFaceWithUVL(@Nullable Direction cullFaceIn, int tintIndexIn, String textureIn, - BlockFaceUV blockFaceUVIn, float sky, float block) { - super(cullFaceIn, tintIndexIn, textureIn, blockFaceUVIn); - this.sky = sky; - this.block = block; - } - - public float getSky() { - return sky; - } - - public float getBlock() { - return block; - } - } - - public static class UVLModelWrapper implements IModelGeometry { - private final BlockModel parent; - - public UVLModelWrapper(BlockModel parent) { - this.parent = parent; - } - - @Override - public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, - Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { - TextureAtlasSprite particle = spriteGetter.apply(owner.resolveTexture("particle")); - - IModelBuilder builder = IModelBuilder.of(owner, overrides, particle); - for (BlockPart blockpart : parent.getElements()) { - for (Direction direction : blockpart.mapFaces.keySet()) { - BlockPartFace blockpartface = blockpart.mapFaces.get(direction); - TextureAtlasSprite textureatlassprite1 = spriteGetter - .apply(owner.resolveTexture(blockpartface.texture)); - BakedQuad quad = BlockModel.makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, - modelTransform, modelLocation); - - if (blockpartface instanceof BlockPartFaceWithUVL) { - BlockPartFaceWithUVL uvlFace = (BlockPartFaceWithUVL) blockpartface; - quad = applyPreBakedLighting(quad, textureatlassprite1, uvlFace.sky, uvlFace.block); - } - - if (blockpartface.cullFace == null) { - builder.addGeneralQuad(quad); - } else { - builder.addFaceQuad(modelTransform.getRotation().rotateTransform(blockpartface.cullFace), quad); - } - } - } - return builder.build(); - } - - private BakedQuad applyPreBakedLighting(BakedQuad quad, TextureAtlasSprite sprite, float sky, float block) { - // FIXME: just piping through the quads and manipulating uv index 2 directly - // seems way easier than this - BakedQuadBuilder builder = new BakedQuadBuilder(sprite); - VertexLighterFlat trans = new VertexLighterFlat(Minecraft.getInstance().getBlockColors()) { - - @Override - protected void updateLightmap(float[] normal, float[] lightmap, float x, float y, float z) { - lightmap[0] = block; - lightmap[1] = sky; - } - - @Override - public void setQuadTint(int tint) { - // Tint requires a block state which we don't have at this point - } - }; - MatrixStack identity = new MatrixStack(); - trans.setTransform(identity.getLast()); - trans.setParent(builder); - quad.pipe(trans); - builder.setQuadTint(quad.getTintIndex()); - builder.setQuadOrientation(quad.getFace()); - builder.setApplyDiffuseLighting(false); - return builder.build(); - } - - @Override - public Collection getTextures(IModelConfiguration owner, - Function modelGetter, - Set> missingTextureErrors) { - return parent.getTextures(modelGetter, missingTextureErrors); - } - - } - -} diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 661d19d63..40ec3d89e 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -76,7 +76,6 @@ import appeng.client.render.model.DriveModel; import appeng.client.render.model.GlassModel; import appeng.client.render.model.MemoryCardModel; import appeng.client.render.model.SkyCompassModel; -import appeng.client.render.model.UVLModelLoader; import appeng.client.render.spatial.SpatialPylonModel; import appeng.core.features.registries.PartModels; import appeng.core.stats.AdvancementTriggers; @@ -204,7 +203,6 @@ public final class AppEng { PlaneModelLoader.INSTANCE); ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "crafting_cube"), CraftingCubeModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "uvlightmap"), UVLModelLoader.INSTANCE); ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "cable_bus"), new CableBusModelLoader((PartModels) Api.INSTANCE.registries().partModels())); diff --git a/src/main/java/appeng/hooks/UnlitQuadHooks.java b/src/main/java/appeng/hooks/UnlitQuadHooks.java new file mode 100644 index 000000000..8eab673e4 --- /dev/null +++ b/src/main/java/appeng/hooks/UnlitQuadHooks.java @@ -0,0 +1,127 @@ +package appeng.hooks; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.client.renderer.LightTexture; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.BlockFaceUV; +import net.minecraft.client.renderer.model.BlockPartFace; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.renderer.vertex.VertexFormatElement; +import net.minecraft.util.Direction; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; + +import appeng.core.AppEng; +import appeng.mixins.unlitquad.BakedQuadAccessor; + +/** + * Implementation details of allowing quads to be defined as "unlit" in JSON + * models by specifying an "unlit" boolean property on the face. + */ +public class UnlitQuadHooks { + + /** + * Offset into the vertex data (which is represented as integers). + */ + private static final int LIGHT_OFFSET = getLightOffset(); + + // Lightmap texture coordinate with full intensity light leading to no drop in + // brightness + private static final int UNLIT_LIGHT_UV = LightTexture.packLight(15, 15); + + /** + * Thread-Local flag to indicate that an enhanced Applied Energistics model is + * currently being deserialized. + */ + private static final ThreadLocal ENABLE_UNLIT_EXTENSIONS = new ThreadLocal<>(); + + /** + * Notify the unlit model system that a specific model is about to be + * deserialized by {@link net.minecraft.client.renderer.model.ModelBakery}. + */ + public static void beginDeserializingModel(ResourceLocation location) { + String namespace = location.getNamespace(); + if (namespace.equals(AppEng.MOD_ID)) { + ENABLE_UNLIT_EXTENSIONS.set(true); + } + } + + /** + * Notify the unlit model system that deserialization of a model has ended. + */ + public static void endDeserializingModel() { + ENABLE_UNLIT_EXTENSIONS.set(false); + } + + public static boolean isUnlitExtensionEnabled() { + Boolean b = ENABLE_UNLIT_EXTENSIONS.get(); + return b != null && b; + } + + public static BlockPartFace enhanceModelElementFace(BlockPartFace modelElement, JsonElement jsonElement) { + JsonObject jsonObject = jsonElement.getAsJsonObject(); + if (JSONUtils.getBoolean(jsonObject, "unlit", false)) { + return new UnlitBlockPartFace(modelElement.cullFace, modelElement.tintIndex, modelElement.texture, + modelElement.blockFaceUV); + } + return modelElement; + } + + /** + * Creates a new quad from the given quad and pre-bakes it to not be affected by + * lighting (neither diffuse lighting nor the prebaked lightmap). This works on + * the assumption that Vanilla will not modify a quad's lightmap data if it's + * not zero. + */ + public static BakedQuad makeUnlit(BakedQuad quad) { + int[] vertexData = quad.getVertexData().clone(); + int stride = DefaultVertexFormats.BLOCK.getIntegerSize(); + // Set the pre-baked texture coords for the lightmap. + // Vanilla will not overwrite them if they are non-zero + for (int i = 0; i < 4; i++) { + vertexData[stride * i + LIGHT_OFFSET] = UNLIT_LIGHT_UV; + } + TextureAtlasSprite sprite = ((BakedQuadAccessor) quad).getSprite(); + // Copy the quad to disable diffuse lighting + return new BakedQuad(vertexData, quad.getTintIndex(), quad.getFace(), sprite, false /* diffuse lighting */); + } + + /** + * This subclass is used as a marker to indicate this face deserialized from + * JSON is supposed to be unlit, which translates to processing by + * {@link #makeUnlit(BakedQuad)}. + */ + public static class UnlitBlockPartFace extends BlockPartFace { + public UnlitBlockPartFace(Direction cullFaceIn, int tintIndexIn, String textureIn, BlockFaceUV blockFaceUVIn) { + super(cullFaceIn, tintIndexIn, textureIn, blockFaceUVIn); + } + } + + /** + * Find the index in the BakedQuad vertex data (for vertex 0) where the lightmap + * coordinates are. Assumes the BLOCK vertex format. + */ + private static int getLightOffset() { + VertexFormat format = DefaultVertexFormats.BLOCK; + int offset = 0; + for (VertexFormatElement element : format.getElements()) { + // TEX_2SB is the lightmap vertex element + if (element == DefaultVertexFormats.TEX_2SB) { + if (element.getType() != VertexFormatElement.Type.SHORT) { + throw new UnsupportedOperationException("Expected light map format to be of type SHORT"); + } + if (offset % 4 != 0) { + throw new UnsupportedOperationException("Expected light map offset to be 4-byte aligned"); + } + return offset / 4; + } + offset += element.getSize(); + } + throw new UnsupportedOperationException("Failed to find the lightmap index in the block vertex format"); + } + +} diff --git a/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java b/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java new file mode 100644 index 000000000..a3bdbb219 --- /dev/null +++ b/src/main/java/appeng/mixins/unlitquad/BakedQuadAccessor.java @@ -0,0 +1,15 @@ +package appeng.mixins.unlitquad; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +@Mixin(BakedQuad.class) +public interface BakedQuadAccessor { + + @Accessor + TextureAtlasSprite getSprite(); + +} diff --git a/src/main/java/appeng/mixins/unlitquad/BlockModelMixin.java b/src/main/java/appeng/mixins/unlitquad/BlockModelMixin.java new file mode 100644 index 000000000..111829ad9 --- /dev/null +++ b/src/main/java/appeng/mixins/unlitquad/BlockModelMixin.java @@ -0,0 +1,37 @@ +package appeng.mixins.unlitquad; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.BlockModel; +import net.minecraft.client.renderer.model.BlockPart; +import net.minecraft.client.renderer.model.BlockPartFace; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; + +import appeng.hooks.UnlitQuadHooks; + +/** + * This mixin hooks into conversion from {@link BlockPartFace} to + * {@link BakedQuad} to apply our unlit extensions if the block part face is an + * instance of our marker class + * {@link appeng.hooks.UnlitQuadHooks.UnlitBlockPartFace}. + */ +@Mixin(BlockModel.class) +public class BlockModelMixin { + + @Inject(method = "bakeFace", at = @At("RETURN"), cancellable = true, require = 1, allow = 1) + private static void onBakeFace(BlockPart partIn, BlockPartFace partFaceIn, TextureAtlasSprite spriteIn, + Direction directionIn, IModelTransform transformIn, ResourceLocation locationIn, + CallbackInfoReturnable cri) { + if (partFaceIn instanceof UnlitQuadHooks.UnlitBlockPartFace) { + cri.setReturnValue(UnlitQuadHooks.makeUnlit(cri.getReturnValue())); + } + } + +} diff --git a/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java b/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java new file mode 100644 index 000000000..1ff2638ab --- /dev/null +++ b/src/main/java/appeng/mixins/unlitquad/BlockPartFaceDeserializerMixin.java @@ -0,0 +1,35 @@ +package appeng.mixins.unlitquad; + +import java.lang.reflect.Type; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.client.renderer.model.BlockPartFace; + +import appeng.hooks.UnlitQuadHooks; + +/** + * This mixin will call the hook to deserialize the unlit property, but only if + * we are currently deserializing an AE2 model. + */ +@Mixin(BlockPartFace.Deserializer.class) +public class BlockPartFaceDeserializerMixin { + + @Inject(method = "deserialize", at = @At("RETURN"), cancellable = true, allow = 1, remap = false) + public void onDeserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext, + CallbackInfoReturnable cri) { + if (!UnlitQuadHooks.isUnlitExtensionEnabled()) { + return; // Not in a model that activated the deserializer + } + + BlockPartFace modelElement = cri.getReturnValue(); + cri.setReturnValue(UnlitQuadHooks.enhanceModelElementFace(modelElement, jsonElement)); + } + +} diff --git a/src/main/java/appeng/mixins/unlitquad/ModelBakeryMixin.java b/src/main/java/appeng/mixins/unlitquad/ModelBakeryMixin.java new file mode 100644 index 000000000..c4cab24ba --- /dev/null +++ b/src/main/java/appeng/mixins/unlitquad/ModelBakeryMixin.java @@ -0,0 +1,34 @@ +package appeng.mixins.unlitquad; + +import java.io.IOException; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.client.renderer.model.BlockModel; +import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.util.ResourceLocation; + +import appeng.hooks.UnlitQuadHooks; + +/** + * The only job of this mixin is to only enable the unlit extensions if the + * model is whitelisted for it, which is decided in {@link UnlitQuadHooks}. + */ +@Mixin(ModelBakery.class) +public class ModelBakeryMixin { + + @Inject(method = "loadModel", at = @At("HEAD"), allow = 1) + protected void onBeginLoadModel(ResourceLocation location, CallbackInfoReturnable cri) + throws IOException { + UnlitQuadHooks.beginDeserializingModel(location); + } + + @Inject(method = "loadModel", at = @At("RETURN")) + protected void onEndLoadModel(ResourceLocation location, CallbackInfoReturnable cri) { + UnlitQuadHooks.endDeserializingModel(); + } + +} diff --git a/src/main/resources/appliedenergistics2.mixins.json b/src/main/resources/appliedenergistics2.mixins.json index c156dcc24..715b1206d 100644 --- a/src/main/resources/appliedenergistics2.mixins.json +++ b/src/main/resources/appliedenergistics2.mixins.json @@ -11,7 +11,14 @@ "DimensionStructuresSettingsMixin", "StructureAccessor" ], - "client": ["SkyRenderMixin", "SkyPropertiesMixin"], + "client": [ + "SkyRenderMixin", + "SkyPropertiesMixin", + "unlitquad.ModelBakeryMixin", + "unlitquad.BlockModelMixin", + "unlitquad.BlockPartFaceDeserializerMixin", + "unlitquad.BakedQuadAccessor" + ], "server": [], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json index 6d593a952..984630029 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "block/stone", @@ -42,50 +41,32 @@ "down": { "texture": "#quartz", "cullface": "down", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#quartz", "cullface": "east", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#quartz", "cullface": "north", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#quartz", "cullface": "south", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#quartz", "cullface": "up", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#quartz", "cullface": "west", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json index 121d8258e..66d754592 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lights_bright": "appliedenergistics2:block/chest/lights_on_bright", "lights_medium": "appliedenergistics2:block/chest/lights_on_medium", @@ -13,10 +12,7 @@ "up": { "texture": "#lights_bright", "tintindex": 3, - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "up": { "texture": "#lights_medium", "tintindex": 2, - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "up": { "texture": "#lights_dark", "tintindex": 1, - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json index 0038cf7a1..f917657ed 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json index 0ed472fd0..655b3d4b0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json index 50e506dfd..779ffc3b4 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_column_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json index 9b7c7527f..caa9e3c36 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "block": "appliedenergistics2:block/controller_column_powered", @@ -12,50 +11,32 @@ "down": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "east": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "north": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "south": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "up": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true }, "west": { "texture": "#lights", "uv": [0, 0, 16, 16], - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } + "unlit": true } }, "from": [0, 0, 0], diff --git a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json index 14d4e092f..06f2d9fc3 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "all": "appliedenergistics2:block/molecular_assembler_lights" @@ -13,55 +12,37 @@ "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "down", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "up", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "north": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "north", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "south": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "south", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "west", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#all", "uv": [2.6, 2.6, 13.4, 13.4], "cullface": "east", - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json index b654e4592..c25b3b786 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "parent": "block/block", "textures": { "particle": "appliedenergistics2:block/security_station_side", @@ -42,10 +41,7 @@ "up": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -56,10 +52,7 @@ "up": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -70,10 +63,7 @@ "up": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json index 60be1d40c..c177c621d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "torch": "appliedenergistics2:block/wireless_access_point_on" @@ -39,10 +38,7 @@ "texture": "#torch", "uv": [7, 7, 9, 9], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -55,19 +51,13 @@ "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 90, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "down": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -79,19 +69,13 @@ "west": { "texture": "#torch", "uv": [6, 6, 10, 10], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#torch", "uv": [6, 6, 10, 10], "rotation": 180, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json index 22a9db566..dbc069977 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json @@ -10,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json index 784ba620c..e3be67738 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json @@ -10,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json index dc374107a..9ded490b6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium_locked", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json index d606f38cf..8f8d8db46 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/conversion_monitor_bright", "lightsMedium": "appliedenergistics2:part/conversion_monitor_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json index b3b37bf99..a6bff04dd 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/crafting_terminal_bright", "lightsMedium": "appliedenergistics2:part/crafting_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json index a3c08b8e5..2332c0c1f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json index 5ea6cdd15..ff9a34fd1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json index 39624a853..f570ba3ae 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/fluid_terminal_bright", "lightsMedium": "appliedenergistics2:part/fluid_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json index 0f6fe350a..3da73d935 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json index 9444d89aa..a20d4889b 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json index f88c8cec0..95b3b485c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/interface_terminal_bright", "lightsMedium": "appliedenergistics2:part/interface_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json index 3a8418500..cac0bbcf2 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "emitter": "appliedenergistics2:part/level_emitter_on", @@ -40,10 +39,7 @@ "texture": "#emitter", "uv": [6, 7, 8, 9], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -56,19 +52,13 @@ "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 90, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "down": { "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 270, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -80,19 +70,13 @@ "west": { "texture": "#emitter", "uv": [5, 6, 9, 10], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#emitter", "uv": [5, 6, 9, 10], "rotation": 180, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json index 459e7a6d8..ace6ff599 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json index edfc24671..3469d5d19 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json index 36412650d..0408175a1 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides", "back": "appliedenergistics2:part/monitor_back", diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json index 6686c7dc7..5d79e20b0 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "ambientocclusion": false, "textures": { "lights": "appliedenergistics2:part/monitor_light" @@ -13,10 +12,7 @@ "north": { "texture": "#lights", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json index 361b7cd80..749be0e5f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lights": "appliedenergistics2:part/monitor_light" }, @@ -11,10 +10,7 @@ "north": { "texture": "#lights", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json index f4477877a..6dd1ca6ba 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lights": "appliedenergistics2:part/monitor_light" }, @@ -11,10 +10,7 @@ "north": { "texture": "#lights", "tintindex": 4, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json index 32f2e7f9d..12ca1ea90 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json index 745408f15..3b9fda716 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json index 773395bfe..e792d4ca8 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/pattern_terminal_bright", "lightsMedium": "appliedenergistics2:part/pattern_terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json index b87024a70..3f5b0904c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_has_channel" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json index 88c28f857..bbe1ed528 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json index 2512544c5..de562aa44 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/storage_monitor_bright", "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json index 994f39b27..86325bf35 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/storage_monitor_bright", "lightsMedium": "appliedenergistics2:part/storage_monitor_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json index 61f131c5b..d9585f270 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "lightsBright": "appliedenergistics2:part/terminal_bright", "lightsMedium": "appliedenergistics2:part/terminal_medium", @@ -13,10 +12,7 @@ "north": { "texture": "#lightsBright", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -27,10 +23,7 @@ "north": { "texture": "#lightsMedium", "tintindex": 2, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } }, @@ -41,10 +34,7 @@ "north": { "texture": "#lightsDark", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json index 9f2640024..9c8a2c25f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json index 444e5f7fe..2c017321f 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "indicator": "appliedenergistics2:part/monitor_sides_status_on" }, @@ -11,34 +10,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json index 412232729..2a0068f07 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/transition_plane_back", @@ -34,34 +33,22 @@ "down": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 1, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json index 22d22c288..447de5476 100644 --- a/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json @@ -1,5 +1,4 @@ { - "loader": "appliedenergistics2:uvlightmap", "textures": { "sides": "appliedenergistics2:part/monitor_sides_status", "back": "appliedenergistics2:part/transition_plane_back", @@ -35,34 +34,22 @@ "down": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "up": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "east": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true }, "west": { "texture": "#indicator", "tintindex": 3, - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } + "unlit": true } } } diff --git a/src/test/resources/assets/uvlightmapjsontest/blockstates/uvlblock.json b/src/test/resources/assets/uvlightmapjsontest/blockstates/uvlblock.json deleted file mode 100644 index c3ea0bc0c..000000000 --- a/src/test/resources/assets/uvlightmapjsontest/blockstates/uvlblock.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "uvlightmapjsontest:uvlblock_vanilla" } - } -} diff --git a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json b/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json deleted file mode 100644 index 8ae4133ed..000000000 --- a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "loader": "appliedenergistics2:uvlightmap", - "textures": { - "0": "block/obsidian", - "1": "uvlightmapjsontest:blocks/BlockControllerLights" - }, - "elements": [ - { - "name": "LL", - "from": [4.0, 0.0, 7.0], - "to": [6.0, 16.0, 9.0], - "faces": { - "north": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "east": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "south": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "west": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "up": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] }, - "down": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] } - } - }, - { - "name": "RL", - "from": [10.0, 0.0, 7.0], - "to": [12.0, 16.0, 9.0], - "faces": { - "north": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "east": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "south": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "west": { "texture": "#0", "uv": [1.0, 0.0, 15.0, 16.0] }, - "up": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] }, - "down": { "texture": "#0", "uv": [0.0, 0.0, 2.0, 2.0] } - } - }, - { - "name": "B", - "from": [6.0, 7.0, 7.0], - "to": [10.0, 9.0, 9.0], - "faces": { - "north": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] }, - "east": { "texture": "#0", "uv": [1.0, 1.0, 3.0, 3.0] }, - "south": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] }, - "west": { "texture": "#0", "uv": [1.0, 1.0, 3.0, 3.0] }, - "up": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] }, - "down": { "texture": "#0", "uv": [0.0, 1.0, 16.0, 3.0] } - } - }, - { - "name": "LLO", - "from": [4.0, 0.0, 7.0], - "to": [6.0, 16.0, 9.0], - "faces": { - "north": { - "texture": "#1", - "uv": [2.0, 0.0, 4.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "east": { - "texture": "#1", - "uv": [5.0, 0.0, 7.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "south": { - "texture": "#1", - "uv": [8.0, 0.0, 10.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "west": { - "texture": "#1", - "uv": [11.0, 0.0, 13.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "up": { - "texture": "#1", - "uv": [6.0, 6.0, 8.0, 8.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "down": { - "texture": "#1", - "uv": [8.0, 8.0, 10.0, 10.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - } - } - }, - { - "name": "RLO", - "from": [10.0, 0.0, 7.0], - "to": [12.0, 16.0, 9.0], - "faces": { - "north": { - "texture": "#1", - "uv": [3.0, 0.0, 5.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "east": { - "texture": "#1", - "uv": [5.0, 0.0, 7.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "south": { - "texture": "#1", - "uv": [7.0, 0.0, 9.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "west": { - "texture": "#1", - "uv": [10.0, 0.0, 12.0, 16.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "up": { - "texture": "#1", - "uv": [6.0, 6.0, 8.0, 8.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "down": { - "texture": "#1", - "uv": [7.0, 8.0, 9.0, 10.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - } - } - }, - { - "name": "BO", - "from": [6.0, 7.0, 7.0], - "to": [10.0, 9.0, 9.0], - "faces": { - "north": { - "texture": "#1", - "uv": [5.0, 6.0, 9.0, 8.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "east": { - "texture": "#1", - "uv": [0.0, 0.0, 2.0, 2.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "south": { - "texture": "#1", - "uv": [5.0, 7.0, 9.0, 9.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "west": { - "texture": "#1", - "uv": [5.0, 3.0, 7.0, 5.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "up": { - "texture": "#1", - "uv": [4.0, 10.0, 8.0, 12.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - }, - "down": { - "texture": "#1", - "uv": [8.0, 8.0, 12.0, 10.0], - "uvlightmap": { "sky": 0.007, "block": 0.007 } - } - } - } - ] -} diff --git a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.model b/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.model deleted file mode 100644 index 97a98f0a4..000000000 Binary files a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock.model and /dev/null differ diff --git a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock_vanilla.json b/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock_vanilla.json deleted file mode 100644 index 69f151821..000000000 --- a/src/test/resources/assets/uvlightmapjsontest/models/block/uvlblock_vanilla.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "uvlightmapjsontest:block/uvlblock", - "textures": { - "0": "block/diamond_block" - } -} diff --git a/src/test/resources/assets/uvlightmapjsontest/models/item/uvlblock.json b/src/test/resources/assets/uvlightmapjsontest/models/item/uvlblock.json deleted file mode 100644 index 4b1ab065f..000000000 --- a/src/test/resources/assets/uvlightmapjsontest/models/item/uvlblock.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "uvlightmapjsontest:block/uvlblock" -} diff --git a/src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png b/src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png deleted file mode 100644 index 199dc88cf..000000000 Binary files a/src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png and /dev/null differ diff --git a/src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png.mcmeta b/src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png.mcmeta deleted file mode 100644 index 3a077b37e..000000000 --- a/src/test/resources/assets/uvlightmapjsontest/textures/blocks/BlockControllerLights.png.mcmeta +++ /dev/null @@ -1,19 +0,0 @@ -{ - "animation": { - "frametime": 3, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ] - } -}