diff --git a/crafting-dead-core/src/main/java/com/craftingdead/core/CraftingDead.java b/crafting-dead-core/src/main/java/com/craftingdead/core/CraftingDead.java index ee7b4e6e4..e6c59efd2 100644 --- a/crafting-dead-core/src/main/java/com/craftingdead/core/CraftingDead.java +++ b/crafting-dead-core/src/main/java/com/craftingdead/core/CraftingDead.java @@ -18,6 +18,8 @@ package com.craftingdead.core; import java.util.ListIterator; + +import net.minecraftforge.client.model.ModelLoaderRegistry; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/crafting-dead-core/src/main/java/com/craftingdead/core/client/ClientDist.java b/crafting-dead-core/src/main/java/com/craftingdead/core/client/ClientDist.java index adeb00bde..e8a36671e 100644 --- a/crafting-dead-core/src/main/java/com/craftingdead/core/client/ClientDist.java +++ b/crafting-dead-core/src/main/java/com/craftingdead/core/client/ClientDist.java @@ -17,11 +17,6 @@ */ package com.craftingdead.core.client; -import java.util.Collection; -import java.util.Optional; -import java.util.function.Function; -import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.glfw.GLFW; import com.craftingdead.core.CraftingDead; import com.craftingdead.core.IModDist; import com.craftingdead.core.capability.ModCapabilities; @@ -36,7 +31,6 @@ import com.craftingdead.core.client.gui.IngameGui; import com.craftingdead.core.client.gui.screen.inventory.GenericContainerScreen; import com.craftingdead.core.client.gui.screen.inventory.PlayerScreen; -import com.craftingdead.core.client.model.PerspectiveAwareModel; import com.craftingdead.core.client.particle.GrenadeSmokeParticle; import com.craftingdead.core.client.particle.RGBFlashParticle; import com.craftingdead.core.client.renderer.CameraManager; @@ -119,7 +113,6 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AttachCapabilitiesEvent; @@ -135,6 +128,12 @@ import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.glfw.GLFW; + +import java.util.Collection; +import java.util.Optional; +import java.util.function.Function; public class ClientDist implements IModDist { @@ -291,8 +290,6 @@ public void handleSoundLoad(SoundLoadEvent event) { private void handleModelRegistry(ModelRegistryEvent event) { StartupMessageManager.addModMessage("Registering model loaders"); - ModelLoaderRegistry.registerLoader(new ResourceLocation(CraftingDead.ID, "perspective_aware"), - PerspectiveAwareModel.Loader.INSTANCE); StartupMessageManager.addModMessage("Gathering item renderers"); this.itemRendererManager.gatherItemRenderers(); StartupMessageManager.addModMessage("Registering special models"); diff --git a/crafting-dead-core/src/main/java/com/craftingdead/core/client/model/PerspectiveAwareModel.java b/crafting-dead-core/src/main/java/com/craftingdead/core/client/model/PerspectiveAwareModel.java deleted file mode 100644 index 6da4ffc17..000000000 --- a/crafting-dead-core/src/main/java/com/craftingdead/core/client/model/PerspectiveAwareModel.java +++ /dev/null @@ -1,301 +0,0 @@ -/** - * Crafting Dead - * Copyright (C) 2020 Nexus Node - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.craftingdead.core.client.model; - -import java.util.Collection; -import java.util.EnumMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import com.craftingdead.core.client.util.RenderUtil; -import com.google.gson.JsonArray; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.datafixers.util.Pair; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.BlockModel; -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.ItemCameraTransforms.TransformType; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.ModelBakery; -import net.minecraft.client.renderer.model.RenderMaterial; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.resources.IResourceManager; -import net.minecraft.util.Direction; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.data.EmptyModelData; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.geometry.IModelGeometry; - -/** - * A model that can be rendered as a different model depending on the view perspective. - */ -public class PerspectiveAwareModel implements IModelGeometry { - - private final Map models; - - public PerspectiveAwareModel(Map models) { - this.models = models; - } - - @Override - public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, - Function spriteGetter, IModelTransform modelTransform, - ItemOverrideList overrides, ResourceLocation modelLocation) { - - Map bakedModels = - this.models.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> { - IUnbakedModel model = entry.getValue(); - if (model instanceof BlockModel) { - BlockModel blockModel = (BlockModel) model; - // Generates a default 2D model if the model has a generation marker - if (RenderUtil.hasGenerationMarker(blockModel)) { - return RenderUtil - .generateSpriteModel(blockModel, bakery, spriteGetter, modelTransform, - modelLocation); - } - } - return model.bakeModel(bakery, spriteGetter, modelTransform, modelLocation); - }, (u, v) -> { - throw new IllegalStateException(String.format("Duplicate key %s", u)); - }, () -> new EnumMap<>(ItemCameraTransforms.TransformType.class))); - - return new BakedPerspectiveAwareModel(bakedModels, - spriteGetter.apply(owner.resolveTexture("particle"))); - } - - @Override - public Collection getTextures(IModelConfiguration owner, - Function modelGetter, - Set> missingTextureErrors) { - Set materials = new HashSet<>(); - materials.add(owner.resolveTexture("particle")); - materials - .addAll(this.models - .values() - .stream() - .flatMap( - model -> model.getTextures(modelGetter, missingTextureErrors).stream()) - .collect(Collectors.toSet())); - return materials; - } - - public static class BakedPerspectiveAwareModel implements IBakedModel { - - private static final ItemOverrideList OVERRIDE_LIST = new ModelOverrideHandler(); - - private final Map bakedModels; - private final TextureAtlasSprite particle; - - public BakedPerspectiveAwareModel( - Map bakedModels, - TextureAtlasSprite particle) { - this.bakedModels = bakedModels; - this.particle = particle; - } - - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, - Random rand) { - return this.getQuads(state, side, rand, EmptyModelData.INSTANCE); - } - - @Override - public List getQuads(@Nullable BlockState state, @Nullable Direction side, - @Nonnull Random rand, @Nonnull IModelData extraData) { - return this.bakedModels - .get(ItemCameraTransforms.TransformType.NONE) - .getQuads(state, side, rand, extraData); - } - - @Override - public boolean isAmbientOcclusion() { - return true; - } - - @Override - public boolean isGui3d() { - return false; - } - - @Override - public boolean isSideLit() { - return false; - } - - @Override - public boolean isBuiltInRenderer() { - return false; - } - - @Override - public TextureAtlasSprite getParticleTexture() { - return this.particle; - } - - @Override - public boolean doesHandlePerspectives() { - return true; - } - - @Override - public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, - MatrixStack mat) { - return this - .getModelForPerspective(cameraTransformType) - .handlePerspective(cameraTransformType, mat); - } - - public IBakedModel getModelForPerspective( - ItemCameraTransforms.TransformType cameraTransformType) { - return this.bakedModels - .getOrDefault(cameraTransformType, - this.bakedModels.get(ItemCameraTransforms.TransformType.NONE)); - } - - @Override - public ItemOverrideList getOverrides() { - return OVERRIDE_LIST; - } - } - - private static final class ModelOverrideHandler extends ItemOverrideList { - - @Override - public IBakedModel getOverrideModel(IBakedModel originalModel, ItemStack itemStack, - @Nullable ClientWorld world, @Nullable LivingEntity livingEntity) { - BakedPerspectiveAwareModel perspectiveModel = (BakedPerspectiveAwareModel) originalModel; - Map bakedModels = - perspectiveModel.bakedModels - .entrySet() - .stream() - .collect(Collectors.toMap(Map.Entry::getKey, entry -> { - IBakedModel model = entry.getValue(); - return model.getOverrides().getOverrideModel(model, itemStack, world, livingEntity); - }, (u, v) -> { - throw new IllegalStateException(String.format("Duplicate key %s", u)); - }, () -> new EnumMap<>(ItemCameraTransforms.TransformType.class))); - return new BakedPerspectiveAwareModel(bakedModels, perspectiveModel.particle); - } - } - - public static final class Loader implements IModelLoader { - - public static final Loader INSTANCE = new Loader(); - - @Override - public void onResourceManagerReload(IResourceManager resourceManager) {} - - @Override - public PerspectiveAwareModel read(JsonDeserializationContext deserializationContext, - JsonObject modelContents) { - Map models = - new EnumMap<>(ItemCameraTransforms.TransformType.class); - models - .put(TransformType.NONE, deserializationContext - .deserialize(JSONUtils.getJsonObject(modelContents, "model"), BlockModel.class)); - - JsonArray modelsJson = modelContents.getAsJsonArray("perspective_overrides"); - for (JsonElement element : modelsJson) { - JsonObject modelJson = element.getAsJsonObject(); - BlockModel model = deserializationContext - .deserialize(JSONUtils.getJsonObject(modelJson, "model"), BlockModel.class); - JsonArray perspectives = modelJson.getAsJsonArray("perspectives"); - for (JsonElement perspectiveJson : perspectives) { - Perspective perpective = Perspective.fromKey(perspectiveJson.getAsString()); - if (perpective != null) { - models.compute(perpective.getTransformType(), (transform, existingModel) -> { - if (existingModel != null) { - throw new IllegalStateException("Multiple models specified for same perspective"); - } - return model; - }); - } - } - } - return new PerspectiveAwareModel(models); - } - } - - public static enum Perspective { - THIRD_PERSON_LEFT_HAND(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND, - "thirdperson_lefthand"), THIRD_PERSON_RIGHT_HAND( - ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, - "thirdperson_righthand"), FIRST_PERSON_LEFT_HAND( - ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, - "firstperson_lefthand"), FIRST_PERSON_RIGHT_HAND( - ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND, - "firstperson_righthand"), HEAD(ItemCameraTransforms.TransformType.HEAD, - "head"), GUI(ItemCameraTransforms.TransformType.GUI, "gui"), GROUND( - ItemCameraTransforms.TransformType.GROUND, - "ground"), FIXED(ItemCameraTransforms.TransformType.FIXED, "fixed"); - - private final ItemCameraTransforms.TransformType transformType; - private final String key; - - private Perspective(ItemCameraTransforms.TransformType transformType, String key) { - this.transformType = transformType; - this.key = key; - } - - public ItemCameraTransforms.TransformType getTransformType() { - return transformType; - } - - public String getKey() { - return key; - } - - public static Perspective fromTransformType( - ItemCameraTransforms.TransformType transformType) { - for (Perspective perspective : values()) { - if (perspective.transformType == transformType) { - return perspective; - } - } - return null; - } - - public static Perspective fromKey(String key) { - for (Perspective perspective : values()) { - if (perspective.key.equals(key)) { - return perspective; - } - } - return null; - } - } -} diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.json similarity index 75% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.json index 5c5fa0de1..b8ea33f78 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/ballistic_helmet.obj", + "model":"craftingdead:models/hats/ballistic_helmet.obj", "flip-v":true, "ambientToFullbright": false, "transform": { diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/ballistic_helmet.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/ballistic_helmet.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.json similarity index 56% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.json index 3c01b4eca..2eabfd6ee 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/bunny_hat.obj", + "model":"craftingdead:models/hats/bunny_hat.obj", "flip-v":true, "ambientToFullbright": false } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/bunny_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/bunny_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.json similarity index 54% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.json index 0aca44be9..e4fa217c5 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/fireman_hat.obj", + "model":"craftingdead:models/hats/chief_fireman_hat.obj", "flip-v":true, "ambientToFullbright": false } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/chief_fireman_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.json new file mode 100644 index 000000000..975a0745e --- /dev/null +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.json @@ -0,0 +1,6 @@ +{ + "loader":"forge:obj", + "model":"craftingdead:models/hats/fireman_hat.obj", + "flip-v":true, + "ambientToFullbright": false +} \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/fireman_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/fireman_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.json similarity index 56% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.json index 033010d26..e13c885b2 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/gas_mask.obj", + "model":"craftingdead:models/hats/gas_mask.obj", "flip-v":true, "ambientToFullbright": false } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/gas_mask.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/gas_mask.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.json similarity index 78% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.json index c5e50d73f..97cfb859d 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/hard_hat.obj", + "model":"craftingdead:models/hats/hard_hat.obj", "flip-v":true, "ambientToFullbright": false, "transform": { diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/hard_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/hard_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.json similarity index 55% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.json index 27083ca48..30aeac87c 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/knight_hat.obj", + "model":"craftingdead:models/hats/knight_hat.obj", "flip-v":true, "ambientToFullbright": false } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/knight_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/knight_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.json similarity index 78% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.json index eeea33d5c..e4a2b0243 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/mask.obj", + "model":"craftingdead:models/hats/mask.obj", "flip-v":true, "ambientToFullbright": false, "transform": { diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/mask.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/mask.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.json new file mode 100644 index 000000000..b3b05e525 --- /dev/null +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.json @@ -0,0 +1,6 @@ +{ + "loader":"forge:obj", + "model":"craftingdead:models/hats/nv_goggles_hat.obj", + "flip-v":true, + "ambientToFullbright": false +} \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/nv_goggles_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.json similarity index 55% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.json index ab62a85b3..991d6f790 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/scuba_mask.obj", + "model":"craftingdead:models/hats/scuba_mask.obj", "flip-v":true, "ambientToFullbright": false } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/scuba_mask.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/scuba_mask.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.json similarity index 71% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.json index 4a6baba5f..91a2da456 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/textured_helmet_multiple_of_8.obj", + "model":"craftingdead:models/hats/textured_helmet_multiple_of_8.obj", "flip-v":true, "ambientToFullbright": false, "transform": { diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_8.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_8.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.json similarity index 72% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.json index 6a916b80d..523d77d43 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/textured_helmet_multiple_of_9.obj", + "model":"craftingdead:models/hats/textured_helmet_multiple_of_9.obj", "flip-v":true, "ambientToFullbright": false, "transform": { diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/textured_helmet_multiple_of_9.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/textured_helmet_multiple_of_9.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.json similarity index 57% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.json rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.json index c90df6fc6..1737fdc91 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.json @@ -1,6 +1,6 @@ { "loader":"forge:obj", - "model":"craftingdead:models/item/hats/top_hat.obj", + "model":"craftingdead:models/hats/top_hat.obj", "flip-v":true, "ambientToFullbright": false } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.mtl b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.mtl similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.mtl rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.mtl diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.obj b/crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.obj similarity index 100% rename from crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/top_hat.obj rename to crafting-dead-core/src/main/resources/assets/craftingdead/models/hats/top_hat.obj diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acog_sight.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acog_sight.json index d05962a2f..884e2c942 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acog_sight.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acog_sight.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/acog_sight" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/acog_sight" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr.json index e6156925f..8d6a5a2b2 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/acr" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/acr" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr_magazine.json index 75cfeb90d..e8fe7dbc2 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/acr_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/acr_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/acr_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ak47.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ak47.json index 423ea3b8b..0750cd1d5 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ak47.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ak47.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/ak47" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/ak47" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/akm_iron_sight.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/akm_iron_sight.json index 40d30949e..3b71f7434 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/akm_iron_sight.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/akm_iron_sight.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/akm_iron_sight" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/akm_iron_sight" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/army_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/army_helmet.json index 1c775a526..189d7bf0c 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/army_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/army_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/army_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/army_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/army_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/army_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50.json index ada4a96fd..9159d09b3 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/as50" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/as50" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_ap_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_ap_magazine.json index c16e5823c..f9882f119 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_ap_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_ap_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/as50_ap_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/as50_ap_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_magazine.json index 8e02bfdc4..a0f96c4f4 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/as50_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/as50_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/as50_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp.json index 04b9ff4b2..57ef9fae1 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/awp" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/awp" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp_magazine.json index 9dfa19f1e..334ef5d27 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/awp_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/awp_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/awp_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/beanie_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/beanie_hat.json index 0935c3ad6..fa0bdc031 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/beanie_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/beanie_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/beanie_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/beanie_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/beanie_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/beanie_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bipod.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bipod.json index 58d856078..1c6dbcd52 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bipod.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bipod.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/bipod" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/bipod" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_ballistic_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_ballistic_hat.json index 935c8b04b..fdddf4030 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_ballistic_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_ballistic_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/black_ballistic_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/ballistic_helmet", - "textures": { - "base":"craftingdead:models/hats/black_ballistic_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/black_ballistic_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/ballistic_helmet", + "textures": { + "base": "craftingdead:models/hats/black_ballistic_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_tactical_vest.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_tactical_vest.json index b84af0112..d78b673b4 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_tactical_vest.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/black_tactical_vest.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/black_tactical_vest" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:vest/tactical_vest", - "textures": { - "base": "craftingdead:vest/black_tactical_vest" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/black_tactical_vest" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:vest/tactical_vest", + "textures": { + "base": "craftingdead:vest/black_tactical_vest" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/blue_hard_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/blue_hard_hat.json index b81f357c2..1967027fa 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/blue_hard_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/blue_hard_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/blue_hard_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/hard_hat", - "textures": { - "base":"craftingdead:models/hats/blue_hard_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/blue_hard_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/hard_hat", + "textures": { + "base": "craftingdead:models/hats/blue_hard_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bunny_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bunny_hat.json index 5ce2fee24..a4d188f37 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bunny_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/bunny_hat.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/bunny_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/bunny_hat", - "textures": { - "base":"craftingdead:models/hats/bunny_hat" - }, - "transform": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.5, -0.65, 0.47 ], - "scale": [ 1, 1, 1 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/bunny_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/bunny_hat", + "textures": { + "base": "craftingdead:models/hats/bunny_hat" + }, + "transform": { + "rotation": [0, 0, 0], + "translation": [0.5, -0.65, 0.47], + "scale": [1, 1, 1] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/camo_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/camo_helmet.json index faf25383c..b27d3c8d7 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/camo_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/camo_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/camo_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/camo_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/camo_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/camo_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/chief_fireman_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/chief_fireman_hat.json index 2802fca1c..37fa2a211 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/chief_fireman_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/chief_fireman_hat.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/chief_fireman_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/chief_fireman_hat", - "textures": { - "base":"craftingdead:models/hats/chief_fireman_hat" - }, - "transform": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.585, -0.65, 0.525 ], - "scale": [ 1.05, 1.05, 1.05 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/chief_fireman_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/chief_fireman_hat", + "textures": { + "base": "craftingdead:models/hats/chief_fireman_hat" + }, + "transform": { + "rotation": [0, 0, 0], + "translation": [0.585, -0.65, 0.525], + "scale": [1.05, 1.05, 1.05] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/clone_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/clone_hat.json index 6ae380a16..b042bc16f 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/clone_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/clone_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/clone_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/clone_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/clone_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/clone_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/combat_bdu_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/combat_bdu_helmet.json index 55aa8e2ea..89946d9fb 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/combat_bdu_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/combat_bdu_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/combat_bdu_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/combat_bdu_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/combat_bdu_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/combat_bdu_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cookie_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cookie_mask.json index 30c260ce2..5dc9a1718 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cookie_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cookie_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/cookie_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/cookie_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/cookie_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/cookie_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cow_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cow_mask.json index fa452548b..a87844469 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cow_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/cow_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/cow_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/mask", - "textures": { - "base":"craftingdead:models/hats/cow_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/cow_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/cow_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/creeper_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/creeper_mask.json index e10b717d9..b01e9d0bb 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/creeper_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/creeper_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/creeper_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/mask", - "textures": { - "base":"craftingdead:models/hats/creeper_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/creeper_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/creeper_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/deadpool_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/deadpool_mask.json index f88a281c7..0bd6bdac0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/deadpool_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/deadpool_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/deadpool_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/deadpool_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/deadpool_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/deadpool_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/desert_eagle.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/desert_eagle.json index 8b85e1142..3ae895ff6 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/desert_eagle.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/desert_eagle.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/desert_eagle" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/desert_eagle" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr.json index 20c97b0f4..bc4f201a2 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/dmr" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/dmr" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr_magazine.json index ba637486c..3fbf01adf 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/dmr_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/dmr_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/dmr_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/doctor_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/doctor_mask.json index f1fb124a9..816f9761d 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/doctor_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/doctor_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/doctor_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/doctor_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/doctor_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/doctor_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/eotech_sight.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/eotech_sight.json index d35096894..960035742 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/eotech_sight.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/eotech_sight.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/eotech_sight" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/eotech_sight" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fireman_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fireman_hat.json index 919185c8d..c880194b7 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fireman_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fireman_hat.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/fireman_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/fireman_hat", - "textures": { - "base":"craftingdead:models/hats/fireman_hat" - }, - "transform": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.585, -0.65, 0.525 ], - "scale": [ 1.05, 1.05, 1.05 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/fireman_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/fireman_hat", + "textures": { + "base": "craftingdead:models/hats/fireman_hat" + }, + "transform": { + "rotation": [0, 0, 0], + "translation": [0.585, -0.65, 0.525], + "scale": [1.05, 1.05, 1.05] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57.json index 06e543865..9bd2e8cf1 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/fn57" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/fn57" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57_magazine.json index d1b15d77b..ff55f8766 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fn57_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/fn57_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/fn57_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal.json index 3fe29bf8f..02bb0b02f 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/fnfal" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/fnfal" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal_magazine.json index 62a825695..ffec114dd 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/fnfal_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/fnfal_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/fnfal_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18.json index 12b2b5c5d..78ae8f4c9 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/g18" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/g18" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18_magazine.json index f0c9730d4..4c00df176 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g18_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/g18_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/g18_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c.json index 5de223393..480cfa2ef 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/g36c" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/g36c" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c_magazine.json index 4a3e62829..25e4dcbde 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/g36c_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/g36c_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/g36c_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/gas_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/gas_mask.json index a914f4514..88382c282 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/gas_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/gas_mask.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/gas_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/gas_mask", - "textures": { - "base":"craftingdead:models/hats/gas_mask" - }, - "transform": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.875, -0.45, 0.25 ], - "scale": [ 1.07, 1.07, 1.07 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/gas_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/gas_mask", + "textures": { + "base": "craftingdead:models/hats/gas_mask" + }, + "transform": { + "rotation": [0, 0, 0], + "translation": [0.875, -0.45, 0.25], + "scale": [1.07, 1.07, 1.07] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_hat.json index 695c974fb..4e3ca9dff 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/ghillie_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/ghillie_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/ghillie_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/ghillie_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_tactical_vest.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_tactical_vest.json index aef818c3c..70b3d1a67 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_tactical_vest.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ghillie_tactical_vest.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/ghillie_tactical_vest" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:vest/tactical_vest", - "textures": { - "base": "craftingdead:vest/ghillie_tactical_vest" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/ghillie_tactical_vest" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:vest/tactical_vest", + "textures": { + "base": "craftingdead:vest/ghillie_tactical_vest" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_army_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_army_helmet.json index 002077361..b1664c8fd 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_army_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_army_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/green_army_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/green_army_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/green_army_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/green_army_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_ballistic_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_ballistic_helmet.json index a7becd169..f36d4a502 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_ballistic_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_ballistic_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/green_ballistic_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/ballistic_helmet", - "textures": { - "base":"craftingdead:models/hats/green_ballistic_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/green_ballistic_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/ballistic_helmet", + "textures": { + "base": "craftingdead:models/hats/green_ballistic_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_hard_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_hard_hat.json index 521bbaad6..fa4e5e44a 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_hard_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_hard_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/green_hard_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/hard_hat", - "textures": { - "base":"craftingdead:models/hats/green_hard_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/green_hard_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/hard_hat", + "textures": { + "base": "craftingdead:models/hats/green_hard_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_tactical_vest.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_tactical_vest.json index 273e37b9d..47c9330e3 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_tactical_vest.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/green_tactical_vest.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/green_tactical_vest" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:vest/tactical_vest", - "textures": { - "base": "craftingdead:vest/green_tactical_vest" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/green_tactical_vest" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:vest/tactical_vest", + "textures": { + "base": "craftingdead:vest/green_tactical_vest" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_army_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_army_helmet.json index 8b2958b19..47fa4f025 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_army_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_army_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/grey_army_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/grey_army_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/grey_army_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/green_army_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_tactical_vest.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_tactical_vest.json index c2e5f3eef..e73a89a82 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_tactical_vest.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/grey_tactical_vest.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/grey_tactical_vest" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:vest/tactical_vest", - "textures": { - "base": "craftingdead:vest/grey_tactical_vest" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/grey_tactical_vest" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:vest/tactical_vest", + "textures": { + "base": "craftingdead:vest/grey_tactical_vest" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hacker_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hacker_mask.json index 3be7317c0..42bab78a7 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hacker_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hacker_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/hacker_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/hacker_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/hacker_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/hacker_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.json deleted file mode 100644 index 1a4259b85..000000000 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/chief_fireman_hat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "loader":"forge:obj", - "model":"craftingdead:models/item/hats/chief_fireman_hat.obj", - "flip-v":true, - "ambientToFullbright": false -} \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.json deleted file mode 100644 index 59d326065..000000000 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hats/nv_goggles_hat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "loader":"forge:obj", - "model":"craftingdead:models/item/hats/nv_goggles_hat.obj", - "flip-v":true, - "ambientToFullbright": false -} \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hazmat_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hazmat_hat.json index da14e22a8..c135dd418 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hazmat_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hazmat_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/hazmat_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/hazmat_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/hazmat_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/hazmat_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/heavy_bow.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/heavy_bow.json deleted file mode 100644 index 41723d4d4..000000000 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/heavy_bow.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/heavy_bow" - } - }, - "perspective_overrides" : [ - { - "perspectives":["thirdperson_righthand", "thirdperson_lefthand", "firstperson_righthand", "firstperson_lefthand"], - "model":{ - "parent":"craftingdead:item/guns/heavy_bow/heavy_bow", - "overrides": [ - { - "predicate": { - "aiming": 1 - }, - "model": "craftingdead:item/guns/heavy_bow/heavy_bow_aiming" - } - ] - } - }, - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/guns/heavy_bow/heavy_bow", - "transform": { - "rotation": [ 0, 90, -90 ], - "translation": [ -0.2, -0.6, -0.7 ], - "scale": [ 0.5, 0.5, 0.5 ] - } - } - } - ] -} \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417.json index 510766272..3efc697c9 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/hk417" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/hk417" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417_magazine.json index 99a20b6fe..865ad1d0e 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hk417_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/hk417_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/hk417_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hp_scope.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hp_scope.json index d704e9568..f9b3b6bf8 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hp_scope.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/hp_scope.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/hp_scope" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/hp_scope" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/juggernaut_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/juggernaut_helmet.json index c45def80f..5b4e1ebe0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/juggernaut_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/juggernaut_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/juggernaut_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/juggernaut_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/juggernaut_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/juggernaut_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/knight_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/knight_hat.json index 32de18d7b..6bf609547 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/knight_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/knight_hat.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/knight_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/knight_hat", - "textures": { - "base":"craftingdead:models/hats/knight_hat" - }, - "transform": { - "rotation": [ 0, 180, 0 ], - "translation": [ -1.65, -0.825, -1.65 ], - "scale": [ 1.15, 1.15, 1.15 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/knight_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/knight_hat", + "textures": { + "base": "craftingdead:models/hats/knight_hat" + }, + "transform": { + "rotation": [0, 180, 0], + "translation": [-1.65, -0.825, -1.65], + "scale": [1.15, 1.15, 1.15] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/lp_scope.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/lp_scope.json index 0d70e197a..3ea1293ec 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/lp_scope.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/lp_scope.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/lp_scope" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/lp_scope" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107.json index 4f6082e74..204d510b1 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m107" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m107" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107_magazine.json index 00dbbb5df..e940c16fe 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m107_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m107_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m107_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911.json index dc43a572b..be3465f8c 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m1911" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m1911" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911_magazine.json index 642756b59..9c5c9507d 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1911_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m1911_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m1911_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand.json index 1fa0efea8..0263ecaf9 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m1garand" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m1garand" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand_magazine.json index 866e0675a..f911e5aaa 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m1garand_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m1garand_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m1garand_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b.json index 36eeb92aa..c344e1f87 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m240b" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m240b" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b_magazine.json index 00f981e84..e116193bc 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m240b_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m240b_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m240b_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m4a1.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m4a1.json index 3ed894022..e84ffd186 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m4a1.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m4a1.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m4a1" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m4a1" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9.json index d4586cbd5..6d7d17da2 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m9" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m9" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9_magazine.json index ff0f19b89..2767cb891 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/m9_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/m9_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/m9_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10.json index 04c6b51b2..7238d4f22 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mac10" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mac10" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_extended_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_extended_magazine.json index 70ae796a1..ca819186c 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_extended_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_extended_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mac10_extended_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mac10_extended_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_magazine.json index e8eb69429..942f9b403 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mac10_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mac10_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mac10_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum.json index 98f13805d..c31f3adce 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/magnum" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/magnum" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum_magazine.json index ef6e32b64..ee98d2e33 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/magnum_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/magnum_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/magnum_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/melee.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/melee.json index 3d8cd0a92..bbbfee817 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/melee.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/melee.json @@ -1,9 +1,9 @@ { - "parent": "item/handheld", - "display": { - "head":{ - "translation":[3, 5, 2.5], - "rotation":[0, 0, 45] - } + "parent": "item/handheld", + "display": { + "head": { + "translation": [3, 5, 2.5], + "rotation": [0, 0, 45] } + } } diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/military_hazmat_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/military_hazmat_hat.json index ab47c61ca..5f208d4d5 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/military_hazmat_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/military_hazmat_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/military_hazmat_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/military_hazmat_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/military_hazmat_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/military_hazmat_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun.json index 92be34260..c0008a620 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/minigun" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/minigun" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun_magazine.json index ef33a4c8a..708c727d4 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/minigun_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/minigun_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/minigun_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod.json index b8df3e9d9..79796cc12 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mk48mod" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mk48mod" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod_magazine.json index eae2c9877..9ea2b92a7 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mk48mod_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mk48mod_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mk48mod_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg.json index e8266b822..d6768e6a7 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mossberg" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mossberg" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg_shells.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg_shells.json index 835c80391..1d0dc37ba 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg_shells.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mossberg_shells.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mossberg_shells" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mossberg_slugs" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5.json index 3090d7e9a..fc6170da1 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mp5a5" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mp5a5" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_21_round_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_21_round_magazine.json index e7e274f6b..5b9de6924 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_21_round_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_21_round_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mp5a5_21_round_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mp5a5_21_round_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_35_round_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_35_round_magazine.json index 381812d2d..f399cbeb4 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_35_round_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_35_round_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mp5a5_35_round_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mp5a5_35_round_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_magazine.json index 993e73fc2..c7336fb72 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mp5a5_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mp5a5_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mp5a5_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55.json index e4dd9e17f..63fc38da5 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mpt55" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mpt55" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55_magazine.json index e9dc38927..b2f6fa812 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/mpt55_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/mpt55_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/mpt55_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ninja_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ninja_hat.json index afefeb3b3..deb02ecc1 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ninja_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ninja_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/ninja_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/ninja_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/ninja_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/ninja_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/nv_goggles_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/nv_goggles_hat.json index 05e18eb2b..d8d9a864a 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/nv_goggles_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/nv_goggles_hat.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/nv_goggles_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/nv_goggles_hat", - "textures": { - "base":"craftingdead:models/hats/nv_goggles_hat" - }, - "transform": { - "rotation": [ 0, 180, 0 ], - "translation": [ -1.55, -0.485, -1.55 ], - "scale": [ 1.05, 1.05, 1.05] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/nv_goggles_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/nv_goggles_hat", + "textures": { + "base": "craftingdead:models/hats/nv_goggles_hat" + }, + "transform": { + "rotation": [0, 180, 0], + "translation": [-1.55, -0.485, -1.55], + "scale": [1.05, 1.05, 1.05] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/orange_hard_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/orange_hard_hat.json index ebc2e0104..35d0a1290 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/orange_hard_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/orange_hard_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/orange_hard_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/hard_hat", - "textures": { - "base":"craftingdead:models/hats/orange_hard_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/orange_hard_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/hard_hat", + "textures": { + "base": "craftingdead:models/hats/orange_hard_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250.json index 0f51e7cbc..aa23f9dd0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/p250" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/p250" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250_magazine.json index c3901db58..b47c6ea74 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p250_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/p250_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/p250_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90.json index 7fc2a1228..658438d6d 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/p90" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/p90" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90_magazine.json index 4ded9bf59..0d125261a 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/p90_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/p90_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/p90_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday2_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday2_mask.json index 830e058bb..d37280eb7 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday2_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday2_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/payday2_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/mask", - "textures": { - "base":"craftingdead:models/hats/payday2_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/payday2_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/payday2_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday_mask.json index 69e4fad81..28dc4983d 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/payday_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/payday_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/mask", - "textures": { - "base":"craftingdead:models/hats/payday_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/payday_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/payday_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pilot_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pilot_helmet.json index dadf097cd..71f579357 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pilot_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pilot_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/pilot_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/pilot_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/pilot_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/pilot_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pistol_iron_sight.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pistol_iron_sight.json index 2c8bbfa4a..fb0fae661 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pistol_iron_sight.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pistol_iron_sight.json @@ -1,25 +1,58 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/pistol_iron_sight" - } + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/pistol_iron_sight" + } + }, + "perspectives": { + "third_person_right_hand": { + "loader": "forge:composite", + "parts": { + "pistol_is1": { + "parent": "craftingdead:item/attachments/pistol_is1/pistol_is1" + }, + "pistol_is2": { + "parent": "craftingdead:item/attachments/pistol_is2/pistol_is2" + } + } + }, + "third_person_left_hand": { + "loader": "forge:composite", + "parts": { + "pistol_is1": { + "parent": "craftingdead:item/attachments/pistol_is1/pistol_is1" + }, + "pistol_is2": { + "parent": "craftingdead:item/attachments/pistol_is2/pistol_is2" + } + } + }, + "first_person_right_hand": { + "model": { + "loader": "forge:composite", + "parts": { + "pistol_is1": { + "parent": "craftingdead:item/attachments/pistol_is1/pistol_is1" + }, + "pistol_is2": { + "parent": "craftingdead:item/attachments/pistol_is2/pistol_is2" + } + } + } }, - "perspective_overrides" : [ - { - "perspectives":["thirdperson_righthand", "thirdperson_lefthand", "firstperson_righthand", "firstperson_lefthand", "head"], - "model":{ - "loader":"forge:composite", - "parts" : { - "pistol_is1": { - "parent":"craftingdead:item/attachments/pistol_is1/pistol_is1" - }, - "pistol_is2" : { - "parent":"craftingdead:item/attachments/pistol_is2/pistol_is2" - } - } - } + "firs_person_left_hand": { + "loader": "forge:composite", + "parts": { + "pistol_is1": { + "parent": "craftingdead:item/attachments/pistol_is1/pistol_is1" + }, + "pistol_is2": { + "parent": "craftingdead:item/attachments/pistol_is2/pistol_is2" } - ] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pumpkin_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pumpkin_mask.json index c439a6570..7ad4421b0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pumpkin_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/pumpkin_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/pumpkin_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/mask", - "textures": { - "base":"craftingdead:models/hats/pumpkin_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/pumpkin_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/pumpkin_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/radar_cap.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/radar_cap.json index 076eb13b6..03f7727c3 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/radar_cap.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/radar_cap.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/radar_cap" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/radar_cap" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/radar_cap" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:item/hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/radar_cap" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_dot_sight.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_dot_sight.json index 32344b8f0..f0afa9758 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_dot_sight.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_dot_sight.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/red_dot_sight" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/red_dot_sight" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_hard_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_hard_hat.json index f63c33137..a05d53667 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_hard_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/red_hard_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/red_hard_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/hard_hat", - "textures": { - "base":"craftingdead:models/hats/red_hard_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/red_hard_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/red_hard_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_hat.json index 9d40c6622..1d62dede0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/riot_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/riot_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/riot_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/riot_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_vest.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_vest.json index 123938c21..b382aaf30 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_vest.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/riot_vest.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/riot_vest" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:vest/tactical_vest", - "textures": { - "base": "craftingdead:vest/riot_vest" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/riot_vest" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:vest/tactical_vest", + "textures": { + "base": "craftingdead:vest/riot_vest" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk.json index a9d7446fa..0d97302cc 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/rpk" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/rpk" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_drum_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_drum_magazine.json index a466cb08f..546f8ddfc 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_drum_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_drum_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/rpk_drum_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/rpk_drum_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_magazine.json index 0adf5a32e..817d68680 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/rpk_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/rpk_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/rpk_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/santa_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/santa_hat.json index 1cc822812..9c6caea61 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/santa_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/santa_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/santa_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/santa_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/santa_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/riot_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scarh.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scarh.json index 78d13181a..26e895ccd 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scarh.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scarh.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/scarh" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/scarh" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scuba_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scuba_mask.json index 966fef92c..137db739f 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scuba_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/scuba_mask.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/scuba_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/scuba_mask", - "textures": { - "base":"craftingdead:models/hats/scuba_mask" - }, - "transform": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0.325, -0.5, -1.85 ], - "scale": [ 1.1, 1.1, 1.1 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/scuba_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/scuba_mask", + "textures": { + "base": "craftingdead:models/hats/scuba_mask" + }, + "transform": { + "rotation": [0, 90, 0], + "translation": [0.325, -0.5, -1.85], + "scale": [1.1, 1.1, 1.1] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sheep_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sheep_mask.json index 37bd073b3..b6c6c4582 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sheep_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sheep_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/sheep_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/mask", - "textures": { - "base":"craftingdead:models/hats/sheep_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/sheep_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/sheep_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ski_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ski_mask.json index 549dcb7ee..b9520fc03 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ski_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ski_mask.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/ski_mask" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/ski_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/ski_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/ski_mask" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/spetsnaz_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/spetsnaz_helmet.json index 6abacd34b..02fb898f8 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/spetsnaz_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/spetsnaz_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/spetsnaz_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/spetsnaz_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/spetsnaz_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/spetsnaz_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22.json index d15041684..5a18baac0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/sporter22" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/sporter22" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22_magazine.json index 4fb868f9e..657fd97b4 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/sporter22_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/sporter22_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/sporter22_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_20_round_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_20_round_magazine.json index b38154cfd..46cab5cc4 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_20_round_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_20_round_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/stanag_20_round_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/stanag_20_round_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_30_round_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_30_round_magazine.json index e1e3803eb..c4f2baae0 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_30_round_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_30_round_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/stanag_30_round_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/stanag_30_round_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_box_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_box_magazine.json index 7fc39894a..ac23b6406 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_box_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_box_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/stanag_box_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/stanag_box_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_drum_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_drum_magazine.json index 2a7385589..0d16067c5 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_drum_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/stanag_drum_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/stanag_drum_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/stanag_drum_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/suppressor.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/suppressor.json index 6a2c5a017..7ed30d95d 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/suppressor.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/suppressor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/suppressor" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/suppressor" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tactical_grip.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tactical_grip.json index d0f60d2b7..811e23fc5 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tactical_grip.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tactical_grip.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/tactical_grip" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/tactical_grip" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tan_tactical_vest.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tan_tactical_vest.json index ff90fef5f..16d9dc2b3 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tan_tactical_vest.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/tan_tactical_vest.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/tan_tactical_vest" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:vest/tactical_vest", - "textures": { - "base": "craftingdead:vest/tan_tactical_vest" - } - } - } - ] + "parent": "item/generated", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/tan_tactical_vest" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:vest/tactical_vest", + "textures": { + "base": "craftingdead:vest/tan_tactical_vest" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser.json index 677e2dde6..35efdd65c 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/taser" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/taser" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser_cartridge.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser_cartridge.json index bc0975dfb..69f441e2a 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser_cartridge.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/taser_cartridge.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/taser_cartridge" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/taser_cartridge" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/top_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/top_hat.json index 7a187eec6..525c6c67a 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/top_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/top_hat.json @@ -1,25 +1,23 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/top_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/top_hat", - "textures": { - "base":"craftingdead:models/hats/top_hat" - }, - "transform": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0.5, -0.15, 0.5 ], - "scale": [ 1, 1, 1 ] - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/top_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/top_hat", + "textures": { + "base": "craftingdead:models/hats/top_hat" + }, + "transform": { + "rotation": [0, 0, 0], + "translation": [0.5, -0.15, 0.5], + "scale": [1, 1, 1] + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trapper_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trapper_hat.json index 8e8a90958..e8df298c1 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trapper_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trapper_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/trapper_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/trapper_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/trapper_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/trapper_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun.json index 04bfa1a54..7dce12f63 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/trenchgun" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/trenchgun" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun_shells.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun_shells.json index 6e0b8e9af..35fab3547 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun_shells.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/trenchgun_shells.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/trenchgun_shells" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/trenchgun_shells" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ushanka_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ushanka_hat.json index c3e39dc57..2ef2de932 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ushanka_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/ushanka_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/ushanka_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_8", - "textures": { - "base":"craftingdead:models/hats/ushanka_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/ushanka_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_8", + "textures": { + "base": "craftingdead:models/hats/ushanka_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector.json index 64eeebb2d..a923a2340 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/vector" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/vector" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector_magazine.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector_magazine.json index 5c9ab3709..c60119cd2 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector_magazine.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/vector_magazine.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/vector_magazine" - } + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/vector_magazine" + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/winter_military_helmet.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/winter_military_helmet.json index 4ce188640..6404fbd26 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/winter_military_helmet.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/winter_military_helmet.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/winter_military_helmet" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/textured_helmet_multiple_of_9", - "textures": { - "base":"craftingdead:models/hats/winter_military_helmet" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/winter_military_helmet" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/textured_helmet_multiple_of_9", + "textures": { + "base": "craftingdead:models/hats/winter_military_helmet" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/yellow_hard_hat.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/yellow_hard_hat.json index b49ba3533..9fb585151 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/yellow_hard_hat.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/yellow_hard_hat.json @@ -1,20 +1,18 @@ { - "loader":"craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/yellow_hard_hat" - } - }, - "perspective_overrides":[ - { - "perspectives":["head"], - "model":{ - "parent":"craftingdead:item/hats/hard_hat", - "textures": { - "base":"craftingdead:models/hats/yellow_hard_hat" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/yellow_hard_hat" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/hard_hat", + "textures": { + "base": "craftingdead:models/hats/yellow_hard_hat" + } + } + } } \ No newline at end of file diff --git a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/zombie_mask.json b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/zombie_mask.json index fc51cead6..af0fd2991 100644 --- a/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/zombie_mask.json +++ b/crafting-dead-core/src/main/resources/assets/craftingdead/models/item/zombie_mask.json @@ -1,22 +1,18 @@ { - "loader": "craftingdead:perspective_aware", - "model": { - "parent": "item/generated", - "textures": { - "layer0": "craftingdead:item/zombie_mask" - } - }, - "perspective_overrides": [ - { - "perspectives": [ - "head" - ], - "model": { - "parent": "craftingdead:item/hats/mask", - "textures": { - "base": "craftingdead:models/hats/zombie_mask" - } - } - } - ] + "parent": "forge:item/default", + "loader": "forge:separate-perspective", + "base": { + "parent": "item/generated", + "textures": { + "layer0": "craftingdead:item/zombie_mask" + } + }, + "perspectives": { + "head": { + "parent": "craftingdead:hats/mask", + "textures": { + "base": "craftingdead:models/hats/zombie_mask" + } + } + } } \ No newline at end of file