From a1850ec90b0cd5871da1bdaaab5b25ed78edaaed Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 30 Oct 2019 02:05:26 +0100 Subject: [PATCH] Deforester - Added Deforester Model and Item --- .../java/com/simibubi/create/AllItems.java | 16 ++- .../com/simibubi/create/CreateClient.java | 5 + .../modules/contraptions/WrenchModel.java | 2 +- .../deforester/DeforesterItem.java | 13 ++ .../deforester/DeforesterItemRenderer.java | 47 +++++++ .../deforester/DeforesterModel.java | 33 +++++ .../placementHandgun/BuilderGunModel.java | 4 +- .../curiosities/tools/AllToolTiers.java | 12 +- .../resources/assets/create/lang/en_us.json | 1 + .../accelerator.json | 0 .../amplifier_core.json | 0 .../body.json | 0 .../chorus_accelerator.json | 0 .../chorus_amplifier.json | 0 .../chorus_body.json | 0 .../chorus_retriever.json | 0 .../chorus_scope.json | 0 .../core.json | 0 .../gold_accelerator.json | 0 .../gold_amplifier.json | 0 .../gold_body.json | 0 .../gold_retriever.json | 0 .../gold_scope.json | 0 .../assets/create/models/item/deforester.json | 117 ++++++++++++++++++ .../create/models/item/deforester/blade.json | 38 ++++++ .../create/models/item/deforester/gear.json | 65 ++++++++++ .../create/models/item/deforester/light.json | 36 ++++++ 27 files changed, 378 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java create mode 100644 src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java create mode 100644 src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/accelerator.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/amplifier_core.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/body.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/chorus_accelerator.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/chorus_amplifier.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/chorus_body.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/chorus_retriever.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/chorus_scope.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/core.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/gold_accelerator.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/gold_amplifier.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/gold_body.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/gold_retriever.json (100%) rename src/main/resources/assets/create/models/item/{placement_handgun => blockzapper}/gold_scope.json (100%) create mode 100644 src/main/resources/assets/create/models/item/deforester.json create mode 100644 src/main/resources/assets/create/models/item/deforester/blade.json create mode 100644 src/main/resources/assets/create/models/item/deforester/gear.json create mode 100644 src/main/resources/assets/create/models/item/deforester/light.json diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index 87e93ae87..e8c7118e8 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -8,12 +8,15 @@ import com.simibubi.create.modules.contraptions.WrenchItemRenderer; import com.simibubi.create.modules.contraptions.relays.VerticalGearboxItem; import com.simibubi.create.modules.contraptions.relays.belt.BeltItem; import com.simibubi.create.modules.curiosities.ChromaticCompoundCubeItem; +import com.simibubi.create.modules.curiosities.deforester.DeforesterItem; +import com.simibubi.create.modules.curiosities.deforester.DeforesterItemRenderer; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItemRenderer; import com.simibubi.create.modules.curiosities.symmetry.SymmetryWandItem; import com.simibubi.create.modules.curiosities.symmetry.client.SymmetryWandItemRenderer; import com.simibubi.create.modules.gardens.TreeFertilizerItem; import com.simibubi.create.modules.logistics.item.CardboardBoxItem; +import com.simibubi.create.modules.logistics.item.FilterItem; import com.simibubi.create.modules.logistics.management.LogisticalDialItem; import com.simibubi.create.modules.logistics.management.base.LogisticalControllerBlock.Type; import com.simibubi.create.modules.logistics.management.base.LogisticalControllerItem; @@ -41,6 +44,8 @@ public enum AllItems { standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.SYMMETRY_WAND)))), PLACEMENT_HANDGUN( new BuilderGunItem(new Properties().setTEISR(() -> () -> renderUsing(AllItemRenderers.BUILDER_GUN)))), + DEFORESTER(new DeforesterItem( + standardItemProperties().setTEISR(() -> () -> renderUsing(AllItemRenderers.DEFORESTER)))), __MATERIALS__(), IRON_SHEET(ingredient()), @@ -94,14 +99,15 @@ public enum AllItems { CARDBOARD_BOX_1612(new CardboardBoxItem(standardItemProperties())), CARDBOARD_BOX_1416(new CardboardBoxItem(standardItemProperties())), CARDBOARD_BOX_1410(new CardboardBoxItem(standardItemProperties())), - + + FILTER(new FilterItem(standardItemProperties())), LOGISTICAL_DIAL(new LogisticalDialItem(standardItemProperties())), LOGISTICAL_CONTROLLER_SUPPLY(new LogisticalControllerItem(standardItemProperties(), Type.SUPPLY)), LOGISTICAL_CONTROLLER_REQUEST(new LogisticalControllerItem(standardItemProperties(), Type.REQUEST)), LOGISTICAL_CONTROLLER_STORAGE(new LogisticalControllerItem(standardItemProperties(), Type.STORAGE)), LOGISTICAL_CONTROLLER_CALCULATION(new LogisticalControllerItem(standardItemProperties(), Type.CALCULATION)), LOGISTICAL_CONTROLLER_TRANSACTIONS(new LogisticalControllerItem(standardItemProperties(), Type.TRANSACTIONS)), - + ; private static class CategoryTracker { @@ -155,7 +161,7 @@ public enum AllItems { public boolean typeOf(ItemStack stack) { return stack.getItem() == item; } - + public ItemStack asStack() { return new ItemStack(item); } @@ -163,7 +169,7 @@ public enum AllItems { // Client private enum AllItemRenderers { - SYMMETRY_WAND, BUILDER_GUN, WRENCH; + SYMMETRY_WAND, BUILDER_GUN, WRENCH, DEFORESTER; } @OnlyIn(Dist.CLIENT) @@ -186,6 +192,8 @@ public enum AllItems { return new BuilderGunItemRenderer(); case WRENCH: return new WrenchItemRenderer(); + case DEFORESTER: + return new DeforesterItemRenderer(); default: return null; } diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 49e389b0e..9ab7b1a15 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -6,6 +6,7 @@ import java.util.function.Function; import com.simibubi.create.modules.contraptions.CachedBufferReloader; import com.simibubi.create.modules.contraptions.WrenchModel; import com.simibubi.create.modules.contraptions.receivers.EncasedFanParticleHandler; +import com.simibubi.create.modules.curiosities.deforester.DeforesterModel; import com.simibubi.create.modules.curiosities.partialWindows.WindowInABlockModel; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunModel; import com.simibubi.create.modules.curiosities.symmetry.client.SymmetryWandModel; @@ -95,6 +96,8 @@ public class CreateClient { t -> new BuilderGunModel(t).loadPartials(event)); swapModels(modelRegistry, getItemModelLocation(AllItems.WRENCH), t -> new WrenchModel(t).loadPartials(event)); + swapModels(modelRegistry, getItemModelLocation(AllItems.DEFORESTER), + t -> new DeforesterModel(t).loadPartials(event)); swapModels(modelRegistry, getBlockModelLocation(AllBlocks.WINDOW_IN_A_BLOCK, BlockModelShapes @@ -115,6 +118,8 @@ public class CreateClient { ModelLoader.addSpecialModel(new ResourceLocation(Create.ID, "item/" + location)); for (String location : WrenchModel.getCustomModelLocations()) ModelLoader.addSpecialModel(new ResourceLocation(Create.ID, "item/" + location)); + for (String location : DeforesterModel.getCustomModelLocations()) + ModelLoader.addSpecialModel(new ResourceLocation(Create.ID, "item/" + location)); } protected static ModelResourceLocation getItemModelLocation(AllItems item) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/WrenchModel.java b/src/main/java/com/simibubi/create/modules/contraptions/WrenchModel.java index a6544bb1b..fbe12c8cb 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/WrenchModel.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/WrenchModel.java @@ -17,7 +17,7 @@ public class WrenchModel extends CustomRenderItemBakedModel { } public static List getCustomModelLocations() { - return Arrays.asList("gear"); + return Arrays.asList("wrench/gear"); } @Override diff --git a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java b/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java new file mode 100644 index 000000000..8af07c21d --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItem.java @@ -0,0 +1,13 @@ +package com.simibubi.create.modules.curiosities.deforester; + +import com.simibubi.create.modules.curiosities.tools.AllToolTiers; + +import net.minecraft.item.AxeItem; + +public class DeforesterItem extends AxeItem { + + public DeforesterItem(Properties builder) { + super(AllToolTiers.RADIANT, 10.0F, -3.1F, builder); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java b/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java new file mode 100644 index 000000000..26d7e7f75 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterItemRenderer.java @@ -0,0 +1,47 @@ +package com.simibubi.create.modules.curiosities.deforester; + +import com.mojang.blaze3d.platform.GLX; +import com.mojang.blaze3d.platform.GlStateManager; +import com.simibubi.create.foundation.utility.AnimationTickHolder; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; +import net.minecraft.item.ItemStack; + +public class DeforesterItemRenderer extends ItemStackTileEntityRenderer { + + @Override + public void renderByItem(ItemStack stack) { + + ItemRenderer itemRenderer = Minecraft.getInstance().getItemRenderer(); + DeforesterModel mainModel = (DeforesterModel) itemRenderer.getModelWithOverrides(stack); + float worldTime = AnimationTickHolder.getRenderTick(); + float lastCoordx = GLX.lastBrightnessX; + float lastCoordy = GLX.lastBrightnessY; + + GlStateManager.pushMatrix(); + GlStateManager.translatef(0.5F, 0.5F, 0.5F); + itemRenderer.renderItem(stack, mainModel.getBakedModel()); + + GlStateManager.disableLighting(); + GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, 240, 120); + itemRenderer.renderItem(stack, mainModel.light); + itemRenderer.renderItem(stack, mainModel.blade); + GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lastCoordx, lastCoordy); + GlStateManager.enableLighting(); + + float angle = worldTime * -10 % 360; + float xOffset = 0; + float zOffset = 0; + GlStateManager.translatef(-xOffset, 0, -zOffset); + GlStateManager.rotated(angle, 0, 1, 0); + GlStateManager.translatef(xOffset, 0, zOffset); + + itemRenderer.renderItem(stack, mainModel.gear); + + + GlStateManager.popMatrix(); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java b/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java new file mode 100644 index 000000000..e38eb1ec1 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/curiosities/deforester/DeforesterModel.java @@ -0,0 +1,33 @@ +package com.simibubi.create.modules.curiosities.deforester; + +import java.util.Arrays; +import java.util.List; + +import com.simibubi.create.foundation.block.CustomRenderItemBakedModel; + +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraftforge.client.event.ModelBakeEvent; + +public class DeforesterModel extends CustomRenderItemBakedModel { + + public IBakedModel gear; + public IBakedModel light; + public IBakedModel blade; + + public DeforesterModel(IBakedModel template) { + super(template); + } + + public static List getCustomModelLocations() { + return Arrays.asList("deforester/gear", "deforester/light", "deforester/blade"); + } + + @Override + public CustomRenderItemBakedModel loadPartials(ModelBakeEvent event) { + this.gear = loadCustomModel(event, "deforester/gear"); + this.light = loadCustomModel(event, "deforester/light"); + this.blade = loadCustomModel(event, "deforester/blade"); + return this; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunModel.java b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunModel.java index aeebae836..8a3f6a61d 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunModel.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunModel.java @@ -40,7 +40,7 @@ public class BuilderGunModel extends CustomRenderItemBakedModel { } public static List getCustomModelLocations() { - String p = "placement_handgun/"; + String p = "blockzapper/"; return Arrays.asList(p + "core", p + "body", p + "amplifier_core", p + "accelerator", p + "gold_body", p + "gold_scope", p + "gold_amplifier", p + "gold_retriever", p + "gold_accelerator", p + "chorus_body", p + "chorus_amplifier", p + "chorus_retriever", p + "chorus_accelerator"); @@ -54,7 +54,7 @@ public class BuilderGunModel extends CustomRenderItemBakedModel { @Override public CustomRenderItemBakedModel loadPartials(ModelBakeEvent event) { - String p = "placement_handgun/"; + String p = "blockzapper/"; this.core = loadCustomModel(event, p + "core"); this.body = loadCustomModel(event, p + "body"); diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java index 34c7eb605..b1e860f33 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/AllToolTiers.java @@ -12,16 +12,20 @@ public enum AllToolTiers implements IItemTier { BLAZING(3, 750, 10.0F, 2.5F, 16, () -> { return Ingredient.fromItems(AllItems.BLAZE_BRASS_CUBE.item); - }), - + }), + ROSE_QUARTZ(3, 1644, 7.0F, 2.0F, 24, () -> { return Ingredient.fromItems(AllItems.REFINED_ROSE_QUARTZ.item); - }), - + }), + SHADOW_STEEL(4, 2303, 16.0F, 3.5F, 10, () -> { return Ingredient.fromItems(AllItems.SHADOW_STEEL_CUBE.item); }), + RADIANT(4, 2303, 16.0F, 3.5F, 10, () -> { + return Ingredient.fromItems(AllItems.REFINED_RADIANCE_CUBE.item); + }), + ; private final int harvestLevel; diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index fa6760ebf..91bb471c4 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -24,6 +24,7 @@ "item.create.flour": "Wheat Flour", "item.create.dough": "Dough", "item.create.wrench": "Wrench", + "item.create.deforester": "Deforester", "item.create.crushed_iron": "Crushed Iron Ore", "item.create.crushed_gold": "Crushed Gold Ore", "item.create.time_scarf": "Scarf with a clock on it", diff --git a/src/main/resources/assets/create/models/item/placement_handgun/accelerator.json b/src/main/resources/assets/create/models/item/blockzapper/accelerator.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/accelerator.json rename to src/main/resources/assets/create/models/item/blockzapper/accelerator.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/amplifier_core.json b/src/main/resources/assets/create/models/item/blockzapper/amplifier_core.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/amplifier_core.json rename to src/main/resources/assets/create/models/item/blockzapper/amplifier_core.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/body.json b/src/main/resources/assets/create/models/item/blockzapper/body.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/body.json rename to src/main/resources/assets/create/models/item/blockzapper/body.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator.json b/src/main/resources/assets/create/models/item/blockzapper/chorus_accelerator.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator.json rename to src/main/resources/assets/create/models/item/blockzapper/chorus_accelerator.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier.json b/src/main/resources/assets/create/models/item/blockzapper/chorus_amplifier.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier.json rename to src/main/resources/assets/create/models/item/blockzapper/chorus_amplifier.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_body.json b/src/main/resources/assets/create/models/item/blockzapper/chorus_body.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/chorus_body.json rename to src/main/resources/assets/create/models/item/blockzapper/chorus_body.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_retriever.json b/src/main/resources/assets/create/models/item/blockzapper/chorus_retriever.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/chorus_retriever.json rename to src/main/resources/assets/create/models/item/blockzapper/chorus_retriever.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_scope.json b/src/main/resources/assets/create/models/item/blockzapper/chorus_scope.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/chorus_scope.json rename to src/main/resources/assets/create/models/item/blockzapper/chorus_scope.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/core.json b/src/main/resources/assets/create/models/item/blockzapper/core.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/core.json rename to src/main/resources/assets/create/models/item/blockzapper/core.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator.json b/src/main/resources/assets/create/models/item/blockzapper/gold_accelerator.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator.json rename to src/main/resources/assets/create/models/item/blockzapper/gold_accelerator.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier.json b/src/main/resources/assets/create/models/item/blockzapper/gold_amplifier.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier.json rename to src/main/resources/assets/create/models/item/blockzapper/gold_amplifier.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_body.json b/src/main/resources/assets/create/models/item/blockzapper/gold_body.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/gold_body.json rename to src/main/resources/assets/create/models/item/blockzapper/gold_body.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_retriever.json b/src/main/resources/assets/create/models/item/blockzapper/gold_retriever.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/gold_retriever.json rename to src/main/resources/assets/create/models/item/blockzapper/gold_retriever.json diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_scope.json b/src/main/resources/assets/create/models/item/blockzapper/gold_scope.json similarity index 100% rename from src/main/resources/assets/create/models/item/placement_handgun/gold_scope.json rename to src/main/resources/assets/create/models/item/blockzapper/gold_scope.json diff --git a/src/main/resources/assets/create/models/item/deforester.json b/src/main/resources/assets/create/models/item/deforester.json new file mode 100644 index 000000000..8abf33803 --- /dev/null +++ b/src/main/resources/assets/create/models/item/deforester.json @@ -0,0 +1,117 @@ +{ + "credit": "Made with Blockbench", + "parent": "create:block/block", + "textures": { + "2": "create:block/andesite_alloy_mesh", + "7": "create:block/blaze_brass_mesh", + "particle": "create:block/andesite_alloy_mesh" + }, + "elements": [ + { + "name": "connector", + "from": [9.5, 10.5, 7], + "to": [10.5, 15.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 7, 8]}, + "faces": { + "north": {"uv": [2, 0, 3, 5], "texture": "#2"}, + "east": {"uv": [2, 0, 4, 5], "texture": "#2"}, + "south": {"uv": [2, 0, 3, 5], "texture": "#2"}, + "west": {"uv": [2, 0, 4, 5], "texture": "#2"}, + "up": {"uv": [2, 0, 3, 2], "texture": "#2"}, + "down": {"uv": [2, 0, 3, 2], "texture": "#2"} + } + }, + { + "name": "body_top", + "from": [4.5, 13.5, 7.25], + "to": [9.5, 15, 8.75], + "faces": { + "north": {"uv": [1, 9, 6, 10.5], "texture": "#7"}, + "east": {"uv": [1, 7, 2.5, 8.5], "texture": "#7"}, + "south": {"uv": [1, 8, 6, 9.5], "texture": "#7"}, + "west": {"uv": [1, 6, 2.5, 7.5], "texture": "#7"}, + "up": {"uv": [1, 8, 6, 9.5], "texture": "#7"}, + "down": {"uv": [2, 7, 7, 8.5], "texture": "#7"} + } + }, + { + "name": "body_bottom", + "from": [5.5, 11, 7.25], + "to": [9.5, 12.5, 8.75], + "faces": { + "north": {"uv": [4, 3, 8, 4.5], "texture": "#7"}, + "east": {"uv": [0, 0, 1.5, 1.5], "texture": "#7"}, + "south": {"uv": [4, 3, 8, 4.5], "texture": "#7"}, + "west": {"uv": [5, 3, 6.5, 4.5], "texture": "#7"}, + "up": {"uv": [5, 3, 10, 3.5], "texture": "#7"}, + "down": {"uv": [5, 4, 9, 5.5], "texture": "#7"} + } + }, + { + "name": "handle", + "from": [7.5, 1, 7.5], + "to": [8.5, 12, 8.5], + "faces": { + "north": {"uv": [0, 0, 1, 11], "texture": "#2"}, + "east": {"uv": [0, 0, 1, 11], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 11], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 11], "texture": "#2"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#2"} + } + }, + { + "name": "handle", + "from": [7, 0, 7], + "to": [9, 1, 9], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#7"}, + "east": {"uv": [3, 0, 5, 1], "texture": "#7"}, + "south": {"uv": [2, 0, 4, 1], "texture": "#7"}, + "west": {"uv": [5, 0, 7, 1], "texture": "#7"}, + "up": {"uv": [5, 9, 7, 11], "texture": "#7"}, + "down": {"uv": [5, 9, 7, 11], "texture": "#7"} + } + }, + { + "name": "handle", + "from": [7, 8, 7], + "to": [9, 9, 9], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 1], "texture": "#7"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#7"}, + "south": {"uv": [0, 0, 2, 1], "texture": "#7"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#7"}, + "up": {"uv": [3, 9, 5, 11], "texture": "#7"}, + "down": {"uv": [5, 9, 7, 11], "texture": "#7"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, 82.5, 0], + "translation": [0, 3.5, 0] + }, + "thirdperson_lefthand": { + "rotation": [0, 268.5, 0], + "translation": [0, 3.5, 0] + }, + "firstperson_righthand": { + "rotation": [-23.5, 105.25, 22.25], + "translation": [0.25, 3.25, 0] + }, + "firstperson_lefthand": { + "rotation": [22, -79, 12], + "translation": [0.25, 3.25, 0] + }, + "ground": { + "rotation": [90, 0, 0] + }, + "gui": { + "rotation": [21, -157, 46], + "translation": [-0.25, -0.5, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/deforester/blade.json b/src/main/resources/assets/create/models/item/deforester/blade.json new file mode 100644 index 000000000..0278e48a6 --- /dev/null +++ b/src/main/resources/assets/create/models/item/deforester/blade.json @@ -0,0 +1,38 @@ +{ + "credit": "Made with Blockbench", + "parent": "create:item/deforester", + "textures": { + "3": "block/white_concrete_powder", + "4": "block/white_stained_glass" + }, + "elements": [ + { + "name": "blade2", + "from": [10.5, 9.7, 7.75], + "to": [11.5, 15.7, 8.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.75, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 6], "texture": "#3"}, + "east": {"uv": [0, 0, 1, 6], "texture": "#3"}, + "south": {"uv": [0, 0, 1, 6], "texture": "#3"}, + "west": {"uv": [0, 0, 1, 6], "texture": "#3"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#3"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#3"} + } + }, + { + "name": "blade3", + "from": [10.25, 9.45, 7.5], + "to": [11.75, 15.95, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6.75, 8]}, + "faces": { + "north": {"uv": [0, 6, 1.5, 12.5], "rotation": 180, "texture": "#4"}, + "east": {"uv": [0, 6, 1, 12.5], "texture": "#4"}, + "south": {"uv": [0, 7, 1.5, 13.5], "texture": "#4"}, + "west": {"uv": [1, 6, 2, 12.5], "texture": "#4"}, + "up": {"uv": [0, 9, 1.5, 10], "texture": "#4"}, + "down": {"uv": [0, 7, 1.5, 8], "texture": "#4"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/deforester/gear.json b/src/main/resources/assets/create/models/item/deforester/gear.json new file mode 100644 index 000000000..b91196df3 --- /dev/null +++ b/src/main/resources/assets/create/models/item/deforester/gear.json @@ -0,0 +1,65 @@ +{ + "credit": "Made with Blockbench", + "parent": "create:item/deforester", + "textures": { + "5": "block/stripped_spruce_log" + }, + "elements": [ + { + "name": "Cog", + "from": [7.5, 9, 6], + "to": [8.5, 10, 10], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [4, 6, 5, 7], "texture": "#5"}, + "east": {"uv": [4, 6, 8, 7], "texture": "#5"}, + "south": {"uv": [4, 6, 5, 7], "texture": "#5"}, + "west": {"uv": [4, 6, 8, 7], "texture": "#5"}, + "up": {"uv": [4, 6, 5, 10], "texture": "#5"}, + "down": {"uv": [4, 6, 5, 10], "texture": "#5"} + } + }, + { + "name": "Cog", + "from": [7.5, 9, 6], + "to": [8.5, 10, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [5, 6, 6, 7], "rotation": 180, "texture": "#5"}, + "east": {"uv": [5, 6, 9, 7], "rotation": 180, "texture": "#5"}, + "south": {"uv": [5, 6, 6, 7], "rotation": 180, "texture": "#5"}, + "west": {"uv": [5, 6, 9, 7], "rotation": 180, "texture": "#5"}, + "up": {"uv": [5, 6, 6, 10], "rotation": 180, "texture": "#5"}, + "down": {"uv": [5, 6, 6, 10], "rotation": 180, "texture": "#5"} + } + }, + { + "name": "Cog", + "from": [7.5, 9, 6], + "to": [8.5, 10, 10], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [5, 6, 6, 7], "rotation": 180, "texture": "#5"}, + "east": {"uv": [5, 6, 9, 7], "rotation": 180, "texture": "#5"}, + "south": {"uv": [5, 6, 6, 7], "rotation": 180, "texture": "#5"}, + "west": {"uv": [5, 6, 9, 7], "rotation": 180, "texture": "#5"}, + "up": {"uv": [5, 6, 6, 10], "rotation": 180, "texture": "#5"}, + "down": {"uv": [5, 6, 6, 10], "rotation": 180, "texture": "#5"} + } + }, + { + "name": "Cog", + "from": [6, 9, 7.5], + "to": [10, 10, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [4, 6, 5, 10], "rotation": 90, "texture": "#5"}, + "east": {"uv": [4, 6, 5, 7], "rotation": 90, "texture": "#5"}, + "south": {"uv": [4, 6, 5, 10], "rotation": 90, "texture": "#5"}, + "west": {"uv": [4, 6, 5, 7], "rotation": 90, "texture": "#5"}, + "up": {"uv": [4, 6, 5, 10], "rotation": 90, "texture": "#5"}, + "down": {"uv": [4, 6, 5, 10], "rotation": 90, "texture": "#5"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/deforester/light.json b/src/main/resources/assets/create/models/item/deforester/light.json new file mode 100644 index 000000000..dcbc3f639 --- /dev/null +++ b/src/main/resources/assets/create/models/item/deforester/light.json @@ -0,0 +1,36 @@ +{ + "credit": "Made with Blockbench", + "parent": "create:item/deforester", + "textures": { + "3": "block/white_concrete_powder", + "4": "block/white_stained_glass" + }, + "elements": [ + { + "name": "light_inner", + "from": [6, 12, 7.75], + "to": [9.5, 14, 8.25], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 16.5, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 3.5, 2], "texture": "#3"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#3"}, + "south": {"uv": [0, 0, 3.5, 2], "texture": "#3"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#3"}, + "up": {"uv": [0, 0, 3.5, 0.5], "texture": "#3"}, + "down": {"uv": [0, 0, 3.5, 0.5], "texture": "#3"} + } + }, + { + "name": "light_outer", + "from": [5.75, 12, 7.5], + "to": [9.5, 14, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 16.5, 7.5]}, + "faces": { + "north": {"uv": [7, 0, 10.75, 2], "texture": "#4"}, + "east": {"uv": [7, 0, 8, 2], "texture": "#4"}, + "south": {"uv": [7, 0, 10.75, 2], "texture": "#4"}, + "west": {"uv": [7, 0, 8, 2], "texture": "#4"} + } + } + ] +} \ No newline at end of file