From baba95e0ebecd987475da8f99d429fd904fc0291 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 21 Oct 2019 23:45:16 +0200 Subject: [PATCH] Spiffy Blockzapper - Reworked animated models for the Handheld Blockzapper - Fixed beam render on non-default FOV settings --- build.gradle | 6 +- src/main/java/com/simibubi/create/Create.java | 2 +- .../com/simibubi/create/CreateClient.java | 14 +- .../com/simibubi/create/CreateItemGroup.java | 2 +- .../placementHandgun/BuilderGunHandler.java | 15 +- .../BuilderGunItemRenderer.java | 136 +++---- .../placementHandgun/BuilderGunModel.java | 45 ++- .../placementHandgun/BuilderGunScreen.java | 4 + .../symmetry/client/SymmetryWandModel.java | 7 + src/main/resources/META-INF/mods.toml | 2 +- .../resources/assets/create/lang/en_us.json | 1 + .../create/models/item/placement_handgun.json | 71 ++-- .../item/placement_handgun/accelerator.json | 63 ++++ .../placement_handgun/amplifier_core.json | 33 ++ .../models/item/placement_handgun/body.json | 66 +++- .../placement_handgun/chorus_accelerator.json | 76 ++-- .../chorus_accelerator_core.json | 23 -- .../placement_handgun/chorus_amplifier.json | 72 +--- .../chorus_amplifier_core.json | 71 ---- .../item/placement_handgun/chorus_body.json | 66 +++- .../item/placement_handgun/chorus_master.json | 341 ------------------ .../placement_handgun/chorus_retriever.json | 44 +-- .../item/placement_handgun/chorus_scope.json | 60 ++- .../models/item/placement_handgun/core.json | 39 +- .../placement_handgun/gold_accelerator.json | 76 ++-- .../gold_accelerator_core.json | 23 -- .../placement_handgun/gold_amplifier.json | 43 +-- .../gold_amplifier_core.json | 42 --- .../item/placement_handgun/gold_body.json | 66 +++- .../placement_handgun/gold_retriever.json | 28 +- .../item/placement_handgun/gold_scope.json | 54 ++- .../textures/block/andesite_alloy_mesh.png | Bin 0 -> 383 bytes .../textures/block/blaze_brass_mesh.png | Bin 0 -> 628 bytes .../textures/block/chorus_chrome_mesh.png | Bin 0 -> 631 bytes 34 files changed, 610 insertions(+), 981 deletions(-) create mode 100644 src/main/resources/assets/create/models/item/placement_handgun/accelerator.json create mode 100644 src/main/resources/assets/create/models/item/placement_handgun/amplifier_core.json delete mode 100644 src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator_core.json delete mode 100644 src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier_core.json delete mode 100644 src/main/resources/assets/create/models/item/placement_handgun/chorus_master.json delete mode 100644 src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator_core.json delete mode 100644 src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier_core.json create mode 100644 src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png create mode 100644 src/main/resources/assets/create/textures/block/blaze_brass_mesh.png create mode 100644 src/main/resources/assets/create/textures/block/chorus_chrome_mesh.png diff --git a/build.gradle b/build.gradle index ca34bd323..1ac49b931 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ archivesBaseName = 'create' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: '20191012-1.14.3' + mappings channel: 'snapshot', version: '20191021-1.14.3' runs { client { @@ -71,12 +71,12 @@ repositories { } dependencies { - minecraft 'net.minecraftforge:forge:1.14.4-28.1.45' + minecraft 'net.minecraftforge:forge:1.14.4-28.1.61' // compile against the JEI API but do not include it at runtime compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.18:api") // at runtime, use the full JEI jar - //runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.18") + runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.10") } jar { diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 6ad1204b6..17f4844c4 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -28,7 +28,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.1.1"; + public static final String VERSION = "0.1.1a"; public static Logger logger = LogManager.getLogger(); public static ItemGroup creativeTab = new CreateItemGroup(); diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index 13f29c9b6..cec3d53db 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -24,6 +24,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.config.ModConfig; @@ -44,9 +46,10 @@ public class CreateClient { modEventBus.addListener(CreateClient::clientInit); modEventBus.addListener(CreateClient::createConfigs); modEventBus.addListener(CreateClient::onModelBake); + modEventBus.addListener(CreateClient::onModelRegistry); }); } - + public static void clientInit(FMLClientSetupEvent event) { schematicSender = new ClientSchematicLoader(); schematicHandler = new SchematicHandler(); @@ -97,7 +100,14 @@ public class CreateClient { BlockModelShapes.getPropertyMapString(AllBlocks.WINDOW_IN_A_BLOCK.get().getDefaultState() .with(BlockStateProperties.WATERLOGGED, true).getValues())), WindowInABlockModel::new); + } + @OnlyIn(Dist.CLIENT) + public static void onModelRegistry(ModelRegistryEvent event) { + for (String location : SymmetryWandModel.getCustomModelLocations()) + ModelLoader.addSpecialModel(new ResourceLocation(Create.ID, "item/" + location)); + for (String location : BuilderGunModel.getCustomModelLocations()) + ModelLoader.addSpecialModel(new ResourceLocation(Create.ID, "item/" + location)); } protected static ModelResourceLocation getItemModelLocation(AllItems item) { @@ -114,6 +124,4 @@ public class CreateClient { modelRegistry.put(location, factory.apply(modelRegistry.get(location))); } - - } diff --git a/src/main/java/com/simibubi/create/CreateItemGroup.java b/src/main/java/com/simibubi/create/CreateItemGroup.java index 4fdd1e99c..b15e55879 100644 --- a/src/main/java/com/simibubi/create/CreateItemGroup.java +++ b/src/main/java/com/simibubi/create/CreateItemGroup.java @@ -15,7 +15,7 @@ public final class CreateItemGroup extends ItemGroup { @Override public ItemStack createIcon() { - return new ItemStack(AllItems.SYMMETRY_WAND.get()); + return new ItemStack(AllBlocks.COGWHEEL.get()); } @Override diff --git a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java index 7edfdbd06..7909bd6eb 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunHandler.java @@ -46,11 +46,11 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @EventBusSubscriber(value = Dist.CLIENT) public class BuilderGunHandler { - private static List cachedBeams; - private static float leftHandAnimation; - private static float rightHandAnimation; - private static float lastLeftHandAnimation; - private static float lastRightHandAnimation; + public static List cachedBeams; + public static float leftHandAnimation; + public static float rightHandAnimation; + public static float lastLeftHandAnimation; + public static float lastRightHandAnimation; private static boolean dontReequipLeft; private static boolean dontReequipRight; @@ -86,8 +86,9 @@ public class BuilderGunHandler { ClientPlayerEntity player = Minecraft.getInstance().player; float yaw = (float) ((player.getYaw(partialTicks)) / -180 * Math.PI); float pitch = (float) ((player.getPitch(partialTicks)) / -180 * Math.PI); - Vec3d barrelPosNoTransform = new Vec3d(mainHand == (player.getPrimaryHand() == HandSide.RIGHT) ? -.35f : .35f, - -0.1f, 1); + boolean rightHand = mainHand == (player.getPrimaryHand() == HandSide.RIGHT); + float zOffset = ((float) Minecraft.getInstance().gameSettings.fov - 70) / -100; + Vec3d barrelPosNoTransform = new Vec3d(rightHand ? -.35f : .35f, -0.115f, .75f + zOffset); Vec3d barrelPos = player.getEyePosition(partialTicks) .add(barrelPosNoTransform.rotatePitch(pitch).rotateYaw(yaw)); return barrelPos; diff --git a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunItemRenderer.java b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunItemRenderer.java index 372b66d8d..f7bfe386a 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunItemRenderer.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunItemRenderer.java @@ -1,5 +1,11 @@ package com.simibubi.create.modules.curiosities.placementHandgun; +import static com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.Components.Accelerator; +import static com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.Components.Amplifier; +import static com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.Components.Body; +import static com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.Components.Retriever; +import static com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.Components.Scope; + import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.ComponentTier; @@ -7,10 +13,13 @@ import com.simibubi.create.modules.curiosities.placementHandgun.BuilderGunItem.C import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTUtil; +import net.minecraft.util.HandSide; import net.minecraft.util.math.MathHelper; import net.minecraftforge.client.model.animation.Animation; @@ -20,85 +29,86 @@ public class BuilderGunItemRenderer extends ItemStackTileEntityRenderer { public void renderByItem(ItemStack stack) { ItemRenderer itemRenderer = Minecraft.getInstance().getItemRenderer(); BuilderGunModel mainModel = (BuilderGunModel) itemRenderer.getModelWithOverrides(stack); - float worldTime = Animation.getWorldTime(Minecraft.getInstance().world, - Minecraft.getInstance().getRenderPartialTicks()); - + float pt = Minecraft.getInstance().getRenderPartialTicks(); + float worldTime = Animation.getWorldTime(Minecraft.getInstance().world, pt); + GlStateManager.pushMatrix(); GlStateManager.translatef(0.5F, 0.5F, 0.5F); float lastCoordx = GLX.lastBrightnessX; float lastCoordy = GLX.lastBrightnessY; - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, Math.min(lastCoordx + 60, 240), Math.min(lastCoordy + 120, 240)); - + itemRenderer.renderItem(stack, mainModel.getBakedModel()); - - if (BuilderGunItem.getTier(Components.Body, stack) == ComponentTier.None) - itemRenderer.renderItem(stack, mainModel.body); - if (BuilderGunItem.getTier(Components.Body, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusBody); - - if (BuilderGunItem.getTier(Components.Scope, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldScope); - if (BuilderGunItem.getTier(Components.Scope, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusScope); - - if (BuilderGunItem.getTier(Components.Amplifier, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldAmp); - if (BuilderGunItem.getTier(Components.Amplifier, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusAmp); - - if (BuilderGunItem.getTier(Components.Retriever, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldRetriever); - if (BuilderGunItem.getTier(Components.Retriever, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusRetriever); - - if (BuilderGunItem.getTier(Components.Accelerator, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldAcc); - if (BuilderGunItem.getTier(Components.Accelerator, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusAcc); + renderComponent(stack, Body, itemRenderer, mainModel.body, mainModel.goldBody, mainModel.chorusBody); + renderComponent(stack, Amplifier, itemRenderer, null, mainModel.goldAmp, mainModel.chorusAmp); + renderComponent(stack, Retriever, itemRenderer, null, mainModel.goldRetriever, mainModel.chorusRetriever); + renderComponent(stack, Scope, itemRenderer, null, mainModel.goldScope, mainModel.chorusScope); - if (mainModel.showBlock && stack.hasTag() && stack.getTag().contains("BlockUsed")) { - BlockState state = NBTUtil.readBlockState(stack.getTag().getCompound("BlockUsed")); - - GlStateManager.pushMatrix(); - GlStateManager.translatef(-0.8F, -0.7F, -0.5F); - GlStateManager.scalef(0.25F, 0.25F, 0.25F); - itemRenderer.renderItem(new ItemStack(state.getBlock()), - Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state)); - GlStateManager.popMatrix(); - } + // Block indicator + if (mainModel.showBlock && stack.hasTag() && stack.getTag().contains("BlockUsed")) + renderBlockUsed(stack, itemRenderer); + + ClientPlayerEntity player = Minecraft.getInstance().player; + boolean leftHanded = player.getPrimaryHand() == HandSide.LEFT; + boolean mainHand = player.getHeldItemMainhand() == stack; + boolean offHand = player.getHeldItemOffhand() == stack; + float last = mainHand ^ leftHanded ? BuilderGunHandler.lastRightHandAnimation + : BuilderGunHandler.lastLeftHandAnimation; + float current = mainHand ^ leftHanded ? BuilderGunHandler.rightHandAnimation + : BuilderGunHandler.leftHandAnimation; + float animation = MathHelper.clamp(MathHelper.lerp(pt, last, current) * 5, 0, 1); + // Core glows GlStateManager.disableLighting(); - - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, MathHelper.sin(worldTime * 5) * 120 + 120, 120); - if (BuilderGunItem.getTier(Components.Accelerator, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldAccCore); - if (BuilderGunItem.getTier(Components.Accelerator, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusAccCore); - - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, 240, 120); - if (BuilderGunItem.getTier(Components.Body, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldBody); - - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, 240, 240); - if (BuilderGunItem.getTier(Components.Amplifier, stack) == ComponentTier.BlazeBrass) - itemRenderer.renderItem(stack, mainModel.goldAmpCore); - if (BuilderGunItem.getTier(Components.Amplifier, stack) == ComponentTier.ChorusChrome) - itemRenderer.renderItem(stack, mainModel.chorusAmpCore); + float multiplier = MathHelper.sin(worldTime * 5); + if (mainHand || offHand) { + multiplier = animation; + } + GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, multiplier * 240, 120); + itemRenderer.renderItem(stack, mainModel.core); + if (BuilderGunItem.getTier(Amplifier, stack) != ComponentTier.None) + itemRenderer.renderItem(stack, mainModel.ampCore); + GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lastCoordx, lastCoordy); + GlStateManager.enableLighting(); + + // Accelerator spins + float angle = worldTime * -25; + if (mainHand || offHand) + angle += 360 * animation; - float angle = worldTime * -50; angle %= 360; - - float offset = -.19f; + float offset = -.155f; GlStateManager.translatef(0, offset, 0); GlStateManager.rotatef(angle, 0, 0, 1); GlStateManager.translatef(0, -offset, 0); - itemRenderer.renderItem(stack, mainModel.rod); - - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lastCoordx, lastCoordy); - GlStateManager.enableLighting(); + renderComponent(stack, Accelerator, itemRenderer, mainModel.acc, mainModel.goldAcc, mainModel.chorusAcc); GlStateManager.popMatrix(); } + public void renderBlockUsed(ItemStack stack, ItemRenderer itemRenderer) { + BlockState state = NBTUtil.readBlockState(stack.getTag().getCompound("BlockUsed")); + + GlStateManager.pushMatrix(); + GlStateManager.translatef(-0.8F, -0.7F, -0.5F); + GlStateManager.scalef(0.25F, 0.25F, 0.25F); + itemRenderer.renderItem(new ItemStack(state.getBlock()), + Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(state)); + GlStateManager.popMatrix(); + } + + public void renderComponent(ItemStack stack, Components component, ItemRenderer itemRenderer, IBakedModel none, + IBakedModel gold, IBakedModel chorus) { + ComponentTier tier = BuilderGunItem.getTier(component, stack); + + IBakedModel model = tier == ComponentTier.ChorusChrome ? chorus : gold; + if (tier == ComponentTier.None) { + if (none == null) + return; + model = none; + } + + itemRenderer.renderItem(stack, model); + } + } 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 dedd8f92c..aeebae836 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 @@ -1,5 +1,8 @@ package com.simibubi.create.modules.curiosities.placementHandgun; +import java.util.Arrays; +import java.util.List; + import javax.vecmath.Matrix4f; import org.apache.commons.lang3.tuple.Pair; @@ -13,30 +16,36 @@ import net.minecraftforge.client.event.ModelBakeEvent; @SuppressWarnings("deprecation") public class BuilderGunModel extends CustomRenderItemBakedModel { - public IBakedModel rod; - public IBakedModel body; public boolean showBlock; - + + public IBakedModel core; + public IBakedModel body; + public IBakedModel ampCore; + public IBakedModel acc; + public IBakedModel goldBody; public IBakedModel goldScope; public IBakedModel goldAmp; - public IBakedModel goldAmpCore; public IBakedModel goldRetriever; public IBakedModel goldAcc; - public IBakedModel goldAccCore; - + public IBakedModel chorusBody; public IBakedModel chorusScope; public IBakedModel chorusAmp; - public IBakedModel chorusAmpCore; public IBakedModel chorusRetriever; public IBakedModel chorusAcc; - public IBakedModel chorusAccCore; - + public BuilderGunModel(IBakedModel template) { super(template); } - + + public static List getCustomModelLocations() { + String p = "placement_handgun/"; + 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"); + } + @Override public Pair handlePerspective(TransformType cameraTransformType) { showBlock = cameraTransformType == TransformType.GUI; @@ -46,26 +55,24 @@ public class BuilderGunModel extends CustomRenderItemBakedModel { @Override public CustomRenderItemBakedModel loadPartials(ModelBakeEvent event) { String p = "placement_handgun/"; - - this.rod = loadCustomModel(event, p + "core"); + + this.core = loadCustomModel(event, p + "core"); this.body = loadCustomModel(event, p + "body"); - + this.ampCore = loadCustomModel(event, p + "amplifier_core"); + this.acc = loadCustomModel(event, p + "accelerator"); + this.goldBody = loadCustomModel(event, p + "gold_body"); this.goldScope = loadCustomModel(event, p + "gold_scope"); this.goldAmp = loadCustomModel(event, p + "gold_amplifier"); - this.goldAmpCore = loadCustomModel(event, p + "gold_amplifier_core"); this.goldRetriever = loadCustomModel(event, p + "gold_retriever"); this.goldAcc = loadCustomModel(event, p + "gold_accelerator"); - this.goldAccCore = loadCustomModel(event, p + "gold_accelerator_core"); - + this.chorusBody = loadCustomModel(event, p + "chorus_body"); this.chorusScope = loadCustomModel(event, p + "chorus_scope"); this.chorusAmp = loadCustomModel(event, p + "chorus_amplifier"); - this.chorusAmpCore = loadCustomModel(event, p + "chorus_amplifier_core"); this.chorusRetriever = loadCustomModel(event, p + "chorus_retriever"); this.chorusAcc = loadCustomModel(event, p + "chorus_accelerator"); - this.chorusAccCore = loadCustomModel(event, p + "chorus_accelerator_core"); - + return this; } diff --git a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunScreen.java b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunScreen.java index d0dfc3a4a..01dc2909e 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunScreen.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/placementHandgun/BuilderGunScreen.java @@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.model.data.EmptyModelData; @SuppressWarnings("deprecation") @@ -42,6 +43,7 @@ public class BuilderGunScreen extends AbstractSimiScreen { private final String title = Lang.translate("gui.blockzapper.title"); private final String patternSection = Lang.translate("gui.blockzapper.patternSection"); + private final String needsUpgradedAmplifier = Lang.translate("gui.blockzapper.needsUpgradedAmplifier"); private IconButton replaceModeButton; private Indicator replaceModeIndicator; @@ -96,6 +98,8 @@ public class BuilderGunScreen extends AbstractSimiScreen { if (nbt.contains("SearchDistance")) spreadRangeInput.setState(nbt.getInt("SearchDistance")); + if (BuilderGunItem.getMaxAoe(item) == 2) + spreadRangeInput.getToolTip().add(1, TextFormatting.RED + needsUpgradedAmplifier); Collections.addAll(widgets, replaceModeButton, replaceModeIndicator, spreadDiagonallyButton, spreadDiagonallyIndicator, spreadMaterialButton, spreadMaterialIndicator, spreadRangeLabel, diff --git a/src/main/java/com/simibubi/create/modules/curiosities/symmetry/client/SymmetryWandModel.java b/src/main/java/com/simibubi/create/modules/curiosities/symmetry/client/SymmetryWandModel.java index 837850453..2f9ed2609 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/symmetry/client/SymmetryWandModel.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/symmetry/client/SymmetryWandModel.java @@ -1,5 +1,8 @@ package com.simibubi.create.modules.curiosities.symmetry.client; +import java.util.Arrays; +import java.util.List; + import com.simibubi.create.foundation.block.CustomRenderItemBakedModel; import net.minecraft.client.renderer.model.IBakedModel; @@ -14,6 +17,10 @@ public class SymmetryWandModel extends CustomRenderItemBakedModel { super(template); } + public static List getCustomModelLocations() { + return Arrays.asList("symmetry_wand_core", "symmetry_wand_bits"); + } + @Override public CustomRenderItemBakedModel loadPartials(ModelBakeEvent event) { this.core = loadCustomModel(event, "symmetry_wand_core"); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index ced147a9a..c343548c8 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -4,7 +4,7 @@ loaderVersion="[28,)" [[mods]] modId="create" -version="0.1.1" +version="0.1.1a" displayName="Create" #updateJSONURL="" authors="simibubi" diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 7bf698b09..96846b791 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -201,6 +201,7 @@ "create.gui.blockzapper.searchDiagonal": "Follow Diagonals", "create.gui.blockzapper.searchFuzzy": "Ignore Material Borders", "create.gui.blockzapper.range": "Spread Range", + "create.gui.blockzapper.needsUpgradedAmplifier": "Requires Upgraded Amplifier", "create.gui.blockzapper.patternSection": "Patterns", "create.gui.blockzapper.pattern.solid": "Solid", "create.gui.blockzapper.pattern.checkered": "Checkerboard", diff --git a/src/main/resources/assets/create/models/item/placement_handgun.json b/src/main/resources/assets/create/models/item/placement_handgun.json index e617ba80c..b832d20e5 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun.json +++ b/src/main/resources/assets/create/models/item/placement_handgun.json @@ -29,66 +29,37 @@ } }, "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian" + "smooth_stone_slab_side": "block/smooth_stone_slab_side", + "4": "minecraft:block/obsidian", + "particle": "block/obsidian" }, "elements": [ { "name": "Grip", - "from": [ 7.0, 1.0, 12.0 ], - "to": [ 9.0, 5.0, 15.0 ], - "rotation": { "origin": [ 8.0, 2.0, 14.0 ], "axis": "x", "angle": -22.5 }, + "from": [ 7.1, 1, 12 ], + "to": [ 8.9, 5, 15 ], + "rotation": { "origin": [ 8, 2, 14 ], "axis": "x", "angle": -22.5 }, "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 4.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 3.0 ] } - } - }, - { - "name": "Connector", - "from": [ 6.499999992549419, 4.0, 7.300000004470348 ], - "to": [ 9.49999999254942, 5.0, 14.300000004470348 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 7.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 7.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 7.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 7.0 ] } + "north": { "texture": "#smooth_stone_slab_side", "uv": [ 5, 7, 6.8, 11 ] }, + "east": { "texture": "#smooth_stone_slab_side", "uv": [ 13, 7, 16, 11 ] }, + "south": { "texture": "#smooth_stone_slab_side", "uv": [ 7, 7, 8.8, 11 ] }, + "west": { "texture": "#smooth_stone_slab_side", "uv": [ 16, 7, 13, 11 ] }, + "up": { "texture": "#smooth_stone_slab_side", "uv": [ 5, 2, 6.8, 5 ] }, + "down": { "texture": "#smooth_stone_slab_side", "uv": [ 7, 11, 8.8, 14 ] } } }, { "name": "Trigger", - "from": [ 7.499999992549419, 3.0, 11.0 ], - "to": [ 8.49999999254942, 6.0, 13.0 ], - "rotation": { "origin": [ 8.0, 2.0, 14.0 ], "axis": "x", "angle": -22.5 }, + "from": [ 7.5, 3, 11 ], + "to": [ 8.5, 6, 13 ], + "rotation": { "origin": [ 8, 2, 14 ], "axis": "x", "angle": -22.5 }, "faces": { - "north": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#4", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "south": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#4", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "up": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, - "down": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } - } - }, - { - "name": "Rod Back Cap", - "from": [ 6.799999997019768, 3.800000011920929, 14.0 ], - "to": [ 9.200000002980232, 6.200000017881393, 15.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.4000000059604645 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.4000000059604645 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.4000000059604645, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.4000000059604645, 1.0 ] } + "north": { "texture": "#4", "uv": [ 6, 4, 7, 7 ] }, + "east": { "texture": "#4", "uv": [ 6, 4, 8, 7 ] }, + "south": { "texture": "#4", "uv": [ 6, 4, 7, 7 ] }, + "west": { "texture": "#4", "uv": [ 5, 4, 7, 7 ] }, + "up": { "texture": "#4", "uv": [ 6, 6, 7, 8 ] }, + "down": { "texture": "#4", "uv": [ 5, 6, 6, 8 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/accelerator.json b/src/main/resources/assets/create/models/item/placement_handgun/accelerator.json new file mode 100644 index 000000000..4f830cfed --- /dev/null +++ b/src/main/resources/assets/create/models/item/placement_handgun/accelerator.json @@ -0,0 +1,63 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "parent": "create:item/placement_handgun", + "textures": { + "cog": "minecraft:block/stripped_spruce_log" + }, + "elements": [ + { + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "faces": { + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } + } + }, + { + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": 45.0 }, + "faces": { + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } + } + }, + { + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } + } + }, + { + "name": "Cog", + "from": [ 5.5, 5, 12 ], + "to": [ 10.5, 6, 14 ], + "faces": { + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 4 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 9, 5 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 7 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/amplifier_core.json b/src/main/resources/assets/create/models/item/placement_handgun/amplifier_core.json new file mode 100644 index 000000000..51b3a7152 --- /dev/null +++ b/src/main/resources/assets/create/models/item/placement_handgun/amplifier_core.json @@ -0,0 +1,33 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "parent": "create:item/placement_handgun", + "textures": { + "2": "block/white_concrete_powder", + "3": "block/white_stained_glass" + }, + "elements": [ + { + "name": "Amplifier Core", + "from": [ 7.3, 3, 3.7 ], + "to": [ 8.7, 4, 7.7 ], + "faces": { + "north": { "texture": "#2", "uv": [ 6, 5, 7, 6 ] }, + "east": { "texture": "#2", "uv": [ 3, 5, 7, 6 ] }, + "west": { "texture": "#2", "uv": [ 3, 7, 7, 8 ] } + } + }, + { + "name": "Amplifier Core Glow", + "from": [ 7.1, 2.6, 3.5 ], + "to": [ 8.9, 4.4, 7.4 ], + "faces": { + "north": { "texture": "#3", "uv": [ 6, 7, 7.8, 8.8 ] }, + "east": { "texture": "#3", "uv": [ 3, 7, 6.9, 8.8 ] }, + "south": { "texture": "#3", "uv": [ 5, 7, 6.8, 8.8 ] }, + "west": { "texture": "#3", "uv": [ 4, 7, 7.9, 8.8 ] }, + "up": { "texture": "#3", "uv": [ 7, 3, 8.8, 6.9 ] }, + "down": { "texture": "#3", "uv": [ 7, 4, 8.8, 7.9 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/body.json b/src/main/resources/assets/create/models/item/placement_handgun/body.json index 57af707b1..b0db3229c 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/body.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/body.json @@ -3,25 +3,61 @@ "ambientocclusion": true, "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian" + "0": "create:block/andesite_alloy_mesh" }, "elements": [ { - "name": "Rod Back", - "from": [ 7.0, 4.000000014901161, 7.0 ], - "to": [ 9.0, 6.000000014901161, 14.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Connector", + "from": [ 7, 4, 2 ], + "to": [ 9, 5, 12 ], "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 7.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 4.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#1", "uv": [ 6.0, 5.0, 8.0, 12.0 ] }, - "down": { "texture": "#1", "uv": [ 8.0, 6.0, 10.0, 13.0 ] } + "north": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 10, 1 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 10, 1 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 10 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 10 ] } + } + }, + { + "name": "Rod Back Cap", + "from": [ 7, 4.5, 14 ], + "to": [ 9, 6.5, 15 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } + } + }, + { + "name": "Connector", + "from": [ 7, 6, 2 ], + "to": [ 9, 7, 12 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 10, 1 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 10, 1 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 10 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 10 ] } + } + }, + { + "name": "Rod Back Cap", + "from": [ 7, 4.5, 11 ], + "to": [ 9, 6.5, 12 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator.json index 3146f34ab..0172df56b 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator.json @@ -2,51 +2,61 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/purpur_pillar" + "cog": "minecraft:block/purpur_block" }, "elements": [ { - "name": "Accelerator", - "from": [ 6.499999992549419, 5.0, 10.300000004470348 ], - "to": [ 9.49999999254942, 6.0, 15.300000004470348 ], + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], "faces": { - "north": { "texture": "#5", "uv": [ 7.0, 1.0, 10.0, 2.0 ] }, - "south": { "texture": "#5", "uv": [ 6.0, 3.0, 9.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 6.0, 10.0, 9.0, 15.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 0.0, 10.0, 5.0 ] } + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } } }, { - "name": "Accelerator Connector", - "from": [ 6.4000000059604645, 7.300000004470348, 10.300000004470348 ], - "to": [ 9.600000008940697, 8.699999995529652, 11.699999995529652 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "x", "angle": 45.0 }, + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": 45.0 }, "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 1.0, 15.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 4.0, 2.0, 5.399999991059303, 3.3999999910593033 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 6.0, 4.200000002980232, 7.399999991059303 ] }, - "west": { "texture": "#0", "uv": [ 4.0, 2.0, 5.399999991059303, 3.3999999910593033 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 6.0, 8.200000002980232, 7.399999991059303 ] }, - "down": { "texture": "#0", "uv": [ 4.0, 4.0, 7.200000002980232, 5.399999991059303 ] } + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } } }, { - "name": "Accelerator Back Cap", - "from": [ 7.100000001490116, 4.3000000193715096, 15.0 ], - "to": [ 8.699999995529652, 5.900000013411045, 15.399999991059303 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, "faces": { - "north": { "texture": "#5", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#5", "uv": [ 12.0, 4.0, 13.0, 6.4000000059604645 ] }, - "south": { "texture": "#5", "uv": [ 11.0, 5.0, 13.0, 7.0 ] }, - "west": { "texture": "#5", "uv": [ 6.0, 2.0, 7.0, 4.4000000059604645 ] }, - "up": { "texture": "#5", "uv": [ 7.0, 6.0, 9.400000005960464, 7.0 ] }, - "down": { "texture": "#5", "uv": [ 9.0, 0.0, 11.400000005960464, 1.0 ] } + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } + } + }, + { + "name": "Cog", + "from": [ 5.5, 5, 12 ], + "to": [ 10.5, 6, 14 ], + "faces": { + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 4 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 9, 5 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 7 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator_core.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator_core.json deleted file mode 100644 index 9c69cd6c1..000000000 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_accelerator_core.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:item/placement_handgun", - "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/purpur_pillar" - }, - "elements": [ - { - "name": "Accelerator Core", - "from": [ 6.499999992549419, 5.0, 10.300000004470348 ], - "to": [ 9.49999999254942, 6.0, 15.300000004470348 ], - "faces": { - "east": { "texture": "#2", "uv": [ 4.0, 2.0, 9.0, 3.0 ] }, - "west": { "texture": "#2", "uv": [ 7.0, 2.0, 12.0, 3.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier.json index 5f6539c6d..d2536deee 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier.json @@ -2,69 +2,33 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/purpur_pillar", - "6": "block/redstone_block" + "0": "create:block/chorus_chrome_mesh" }, "elements": [ { - "name": "Amplifier", - "from": [ 10.000000014901161, 4.0, 4.0 ], - "to": [ 11.000000014901161, 5.0, 10.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, + "name": "Amplifier Connector", + "from": [ 7, 2, 3 ], + "to": [ 9, 3, 8 ], "faces": { - "north": { "texture": "#5", "uv": [ 1.0, 2.0, 2.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 10.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#5", "uv": [ 7.0, 7.0, 8.0, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 0.0, 1.0, 6.0, 2.0 ] }, - "up": { "texture": "#5", "uv": [ 2.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#5", "uv": [ 13.0, 10.0, 14.0, 16.0 ] } + "north": { "texture": "#0", "uv": [ 1, 3, 3, 4 ] }, + "east": { "texture": "#0", "uv": [ 11, 5, 16, 6 ] }, + "south": { "texture": "#0", "uv": [ 0, 3, 2, 4 ] }, + "west": { "texture": "#0", "uv": [ 0, 5, 5, 6 ] }, + "up": { "texture": "#0", "uv": [ 0, 3, 5, 5 ], "rotation": 90 }, + "down": { "texture": "#0", "uv": [ 0, 3, 5, 5 ], "rotation": 270 } } }, { "name": "Amplifier Connector", - "from": [ 9.800000011920929, 5.0, 8.0 ], - "to": [ 10.800000011920929, 8.0, 9.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, + "from": [ 7, 3, 7 ], + "to": [ 9, 4, 8 ], "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 3.0, 7.0, 6.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#0", "uv": [ 10.0, 2.0, 14.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 15.0, 11.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 10.0, 3.0, 11.0, 4.0 ] } - } - }, - { - "name": "Amplifier Connector 2", - "from": [ 7.800000011920929, 7.0, 8.0 ], - "to": [ 9.800000011920929, 8.0, 9.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 3.0, 7.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 10.0, 2.0, 13.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 7.0, 6.0, 9.0, 7.0 ] }, - "down": { "texture": "#0", "uv": [ 10.0, 3.0, 12.0, 4.0 ] } - } - }, - { - "name": "Amplifier 2", - "from": [ 5.000000014901161, 3.0, 4.0 ], - "to": [ 6.000000014901161, 4.0, 10.0 ], - "rotation": { "origin": [ 5.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#5", "uv": [ 1.0, 2.0, 2.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 10.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#5", "uv": [ 7.0, 7.0, 8.0, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 0.0, 1.0, 6.0, 2.0 ] }, - "up": { "texture": "#5", "uv": [ 2.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#5", "uv": [ 13.0, 10.0, 14.0, 16.0 ] } + "north": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 1 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 1 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier_core.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier_core.json deleted file mode 100644 index c54f8a7ce..000000000 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_amplifier_core.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:item/placement_handgun", - "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/purpur_pillar", - "6": "block/redstone_block" - }, - "elements": [ - { - "name": "Amplifier Core", - "from": [ 10.000000014901161, 4.0, 3.0 ], - "to": [ 11.000000014901161, 5.0, 4.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "east": { "texture": "#2", "uv": [ 10.0, 1.0, 11.0, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "west": { "texture": "#2", "uv": [ 3.0, 5.0, 4.0, 6.0 ] }, - "up": { "texture": "#2", "uv": [ 11.0, 1.0, 10.0, 2.0 ] }, - "down": { "texture": "#2", "uv": [ 13.0, 10.0, 14.0, 11.0 ] } - } - }, - { - "name": "Amplifier Core 2", - "from": [ 5.000000014901161, 3.0, 3.0 ], - "to": [ 6.000000014901161, 4.0, 4.0 ], - "rotation": { "origin": [ 5.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "east": { "texture": "#2", "uv": [ 10.0, 1.0, 11.0, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "west": { "texture": "#2", "uv": [ 3.0, 5.0, 4.0, 6.0 ] }, - "up": { "texture": "#2", "uv": [ 11.0, 1.0, 10.0, 2.0 ] }, - "down": { "texture": "#2", "uv": [ 13.0, 10.0, 14.0, 11.0 ] } - } - }, - { - "name": "Amplifier Glow", - "from": [ 9.8, 3.7999999970197678, 2.7999999970197678 ], - "to": [ 11.200000005960465, 5.200000002980232, 4.200000002980232 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#3", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "up": { "texture": "#3", "uv": [ 7.0, 6.0, 9.0, 8.0 ] }, - "down": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - }, - { - "name": "Amplifier Glow 2", - "from": [ 4.800000000000001, 2.7999999970197678, 2.7999999970197678 ], - "to": [ 6.200000005960465, 4.200000002980232, 4.200000002980232 ], - "rotation": { "origin": [ 5.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#3", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "up": { "texture": "#3", "uv": [ 7.0, 6.0, 9.0, 8.0 ] }, - "down": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_body.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_body.json index 51222f9b5..dd946f695 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_body.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/chorus_body.json @@ -3,25 +3,61 @@ "ambientocclusion": true, "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/end_stone", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian" + "0": "create:block/chorus_chrome_mesh" }, "elements": [ { - "name": "Rod Back", - "from": [ 7.0, 4.000000014901161, 7.0 ], - "to": [ 9.0, 6.000000014901161, 14.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Connector", + "from": [ 7, 4, 2 ], + "to": [ 9, 5, 12 ], "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 7.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 4.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#1", "uv": [ 6.0, 5.0, 8.0, 12.0 ] }, - "down": { "texture": "#1", "uv": [ 8.0, 6.0, 10.0, 13.0 ] } + "north": { "texture": "#0", "uv": [ 6, 3, 8, 4 ] }, + "east": { "texture": "#0", "uv": [ 6, 5, 16, 6 ] }, + "south": { "texture": "#0", "uv": [ 8, 5, 10, 6 ] }, + "west": { "texture": "#0", "uv": [ 0, 5, 10, 6 ] }, + "up": { "texture": "#0", "uv": [ 3, 3, 13, 5 ], "rotation": 270 }, + "down": { "texture": "#0", "uv": [ 0, 4, 10, 6 ], "rotation": 270 } + } + }, + { + "name": "Rod Back Cap", + "from": [ 7, 4.5, 14 ], + "to": [ 9, 6.5, 15 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } + } + }, + { + "name": "Connector", + "from": [ 7, 6, 2 ], + "to": [ 9, 7, 12 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0, 8, 2, 9 ] }, + "east": { "texture": "#0", "uv": [ 0, 6, 10, 7 ] }, + "south": { "texture": "#0", "uv": [ 0, 7, 2, 8 ] }, + "west": { "texture": "#0", "uv": [ 0, 6, 10, 7 ] }, + "up": { "texture": "#0", "uv": [ 0, 6, 2, 16 ] }, + "down": { "texture": "#0", "uv": [ 0, 6, 2, 16 ] } + } + }, + { + "name": "Rod Back Cap", + "from": [ 7, 4.5, 11 ], + "to": [ 9, 6.5, 12 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_master.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_master.json deleted file mode 100644 index c99986a3e..000000000 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_master.json +++ /dev/null @@ -1,341 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:item/placement_handgun", - "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/gold_block", - "6": "block/redstone_block" - }, - "elements": [ - { - "name": "Grip", - "from": [ 7.0, 1.0, 12.0 ], - "to": [ 9.0, 5.0, 15.0 ], - "rotation": { "origin": [ 8.0, 2.0, 14.0 ], "axis": "x", "angle": -22.5 }, - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 4.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 4.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 4.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 3.0 ] } - } - }, - { - "name": "Connector", - "from": [ 6.499999992549419, 4.0, 7.300000004470348 ], - "to": [ 9.49999999254942, 5.0, 14.300000004470348 ], - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 7.0, 1.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 7.0, 1.0 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 7.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 3.0, 7.0 ] } - } - }, - { - "name": "Rod Back", - "from": [ 7.0, 4.000000014901161, 7.0 ], - "to": [ 9.0, 6.000000014901161, 14.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 7.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 4.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#1", "uv": [ 6.0, 5.0, 8.0, 12.0 ] }, - "down": { "texture": "#1", "uv": [ 8.0, 6.0, 10.0, 13.0 ] } - } - }, - { - "name": "Rod Front", - "from": [ 7.300000004470348, 4.3000000193715096, 0.5000000074505806 ], - "to": [ 8.699999995529652, 5.700000010430813, 8.50000000745058 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3999999910593033, 1.3999999910593033 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 8.0, 1.3999999910593033 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3999999910593033, 1.3999999910593033 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 8.0, 1.3999999910593033 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3999999910593033, 8.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 0.0, 1.3999999910593033, 8.0 ] } - } - }, - { - "name": "Rod Glow", - "from": [ 6.899999998509884, 3.900000013411045, 0.0 ], - "to": [ 9.100000001490116, 6.100000016391277, 7.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 2.2000000029802322, 2.2000000029802322 ] }, - "east": { "texture": "#3", "uv": [ 0.0, 0.0, 7.0, 2.2000000029802322 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 2.2000000029802322, 2.2000000029802322 ] }, - "west": { "texture": "#3", "uv": [ 0.0, 0.0, 7.0, 2.2000000029802322 ] }, - "up": { "texture": "#3", "uv": [ 0.0, 0.0, 2.2000000029802322, 7.0 ] }, - "down": { "texture": "#3", "uv": [ 0.0, 0.0, 2.2000000029802322, 7.0 ] } - } - }, - { - "name": "Trigger", - "from": [ 7.499999992549419, 3.0, 11.0 ], - "to": [ 8.49999999254942, 6.0, 13.0 ], - "rotation": { "origin": [ 8.0, 2.0, 14.0 ], "axis": "x", "angle": -22.5 }, - "faces": { - "north": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#4", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "south": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#4", "uv": [ 0.0, 0.0, 2.0, 3.0 ] }, - "up": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 2.0 ] }, - "down": { "texture": "#4", "uv": [ 0.0, 0.0, 1.0, 2.0 ] } - } - }, - { - "name": "Rod Back Cap", - "from": [ 6.799999997019768, 3.800000011920929, 14.0 ], - "to": [ 9.200000002980232, 6.200000017881393, 15.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.4000000059604645 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 2.4000000059604645 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 2.4000000059604645, 1.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 2.4000000059604645, 1.0 ] } - } - }, - { - "name": "Scope", - "from": [ 7.500000007450581, 6.0, 6.0 ], - "to": [ 8.50000000745058, 7.0, 12.0 ], - "faces": { - "north": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 8.0 ] }, - "east": { "texture": "#5", "uv": [ 8.0, 15.0, 14.0, 16.0 ] }, - "south": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 9.0 ] }, - "west": { "texture": "#5", "uv": [ 6.0, 15.0, 12.0, 16.0 ] }, - "up": { "texture": "#5", "uv": [ 15.0, 5.0, 16.0, 11.0 ] }, - "down": { "texture": "#5", "uv": [ 15.0, 4.0, 16.0, 10.0 ] } - } - }, - { - "name": "Scope Back", - "from": [ 7.200000002980232, 7.0, 10.0 ], - "to": [ 8.800000011920929, 9.0, 12.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#5", "uv": [ 13.0, 1.0, 15.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 4.0, 2.0, 6.0, 4.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 6.0, 2.6000000089406967, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 4.0, 2.0, 6.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 5.0, 6.0, 6.600000008940697, 8.0 ] }, - "down": { "texture": "#5", "uv": [ 4.0, 4.0, 5.600000008940697, 6.0 ] } - } - }, - { - "name": "ScopeTop", - "from": [ 7.0, 7.0, 9.0 ], - "to": [ 9.0, 9.0, 13.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#5", "uv": [ 6.0, 3.0, 10.0, 5.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "west": { "texture": "#5", "uv": [ 10.0, 2.0, 14.0, 3.0 ] }, - "up": { "texture": "#5", "uv": [ 15.0, 11.0, 14.0, 15.0 ] }, - "down": { "texture": "#5", "uv": [ 10.0, 3.0, 12.0, 7.0 ] } - } - }, - { - "name": "Amplifier", - "from": [ 10.000000014901161, 4.0, 4.0 ], - "to": [ 11.000000014901161, 5.0, 10.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#5", "uv": [ 1.0, 2.0, 2.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 10.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#5", "uv": [ 7.0, 7.0, 8.0, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 0.0, 1.0, 6.0, 2.0 ] }, - "up": { "texture": "#5", "uv": [ 2.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#5", "uv": [ 13.0, 10.0, 14.0, 16.0 ] } - } - }, - { - "name": "Amplifier Connector", - "from": [ 9.800000011920929, 5.0, 8.0 ], - "to": [ 10.800000011920929, 8.0, 9.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 3.0, 7.0, 6.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#0", "uv": [ 10.0, 2.0, 14.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 15.0, 11.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 10.0, 3.0, 11.0, 4.0 ] } - } - }, - { - "name": "Amplifier Glow", - "from": [ 9.8, 3.7999999970197678, 2.7999999970197678 ], - "to": [ 11.200000005960465, 5.200000002980232, 4.200000002980232 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#3", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "up": { "texture": "#3", "uv": [ 7.0, 6.0, 9.0, 8.0 ] }, - "down": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - }, - { - "name": "Amplifier Core", - "from": [ 10.000000014901161, 4.0, 3.0 ], - "to": [ 11.000000014901161, 5.0, 4.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "east": { "texture": "#2", "uv": [ 10.0, 1.0, 11.0, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "west": { "texture": "#2", "uv": [ 3.0, 5.0, 4.0, 6.0 ] }, - "up": { "texture": "#2", "uv": [ 11.0, 1.0, 10.0, 2.0 ] }, - "down": { "texture": "#2", "uv": [ 13.0, 10.0, 14.0, 11.0 ] } - } - }, - { - "name": "Retriever Back", - "from": [ 7.0, 2.0, 8.0 ], - "to": [ 9.0, 4.0, 9.0 ], - "rotation": { "origin": [ 8.0, 3.0, 7.0 ], "axis": "x", "angle": -22.5 }, - "faces": { - "north": { "texture": "#5", "uv": [ 12.0, 4.0, 14.0, 6.0 ] }, - "east": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 10.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 13.0, 3.0, 15.0 ] }, - "west": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 9.0 ] }, - "up": { "texture": "#5", "uv": [ 3.0, 15.0, 5.0, 16.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 15.0, 9.0, 16.0 ] } - } - }, - { - "name": "Accelerator", - "from": [ 6.499999992549419, 5.0, 10.300000004470348 ], - "to": [ 9.49999999254942, 6.0, 15.300000004470348 ], - "faces": { - "north": { "texture": "#5", "uv": [ 7.0, 1.0, 10.0, 2.0 ] }, - "south": { "texture": "#5", "uv": [ 6.0, 3.0, 9.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 6.0, 10.0, 9.0, 15.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 0.0, 10.0, 5.0 ] } - } - }, - { - "name": "Accelerator Core", - "from": [ 6.499999992549419, 5.0, 10.300000004470348 ], - "to": [ 9.49999999254942, 6.0, 15.300000004470348 ], - "faces": { - "east": { "texture": "#2", "uv": [ 4.0, 2.0, 9.0, 3.0 ] }, - "west": { "texture": "#2", "uv": [ 7.0, 2.0, 12.0, 3.0 ] } - } - }, - { - "name": "Accelerator Connector", - "from": [ 6.4000000059604645, 7.300000004470348, 10.300000004470348 ], - "to": [ 9.600000008940697, 8.699999995529652, 11.699999995529652 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "x", "angle": 45.0 }, - "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 1.0, 15.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 4.0, 2.0, 5.399999991059303, 3.3999999910593033 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 6.0, 4.200000002980232, 7.399999991059303 ] }, - "west": { "texture": "#0", "uv": [ 4.0, 2.0, 5.399999991059303, 3.3999999910593033 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 6.0, 8.200000002980232, 7.399999991059303 ] }, - "down": { "texture": "#0", "uv": [ 4.0, 4.0, 7.200000002980232, 5.399999991059303 ] } - } - }, - { - "name": "Accelerator Back Cap", - "from": [ 7.100000001490116, 4.3000000193715096, 15.0 ], - "to": [ 8.699999995529652, 5.900000013411045, 15.399999991059303 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, - "faces": { - "north": { "texture": "#5", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#5", "uv": [ 12.0, 4.0, 13.0, 6.4000000059604645 ] }, - "south": { "texture": "#5", "uv": [ 11.0, 5.0, 13.0, 7.0 ] }, - "west": { "texture": "#5", "uv": [ 6.0, 2.0, 7.0, 4.4000000059604645 ] }, - "up": { "texture": "#5", "uv": [ 7.0, 6.0, 9.400000005960464, 7.0 ] }, - "down": { "texture": "#5", "uv": [ 9.0, 0.0, 11.400000005960464, 1.0 ] } - } - }, - { - "name": "Amplifier Connector 2", - "from": [ 7.800000011920929, 7.0, 8.0 ], - "to": [ 9.800000011920929, 8.0, 9.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 3.0, 7.0, 4.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#0", "uv": [ 10.0, 2.0, 13.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 7.0, 6.0, 9.0, 7.0 ] }, - "down": { "texture": "#0", "uv": [ 10.0, 3.0, 12.0, 4.0 ] } - } - }, - { - "name": "Amplifier 2", - "from": [ 5.000000014901161, 3.0, 4.0 ], - "to": [ 6.000000014901161, 4.0, 10.0 ], - "rotation": { "origin": [ 5.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#5", "uv": [ 1.0, 2.0, 2.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 10.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#5", "uv": [ 7.0, 7.0, 8.0, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 0.0, 1.0, 6.0, 2.0 ] }, - "up": { "texture": "#5", "uv": [ 2.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#5", "uv": [ 13.0, 10.0, 14.0, 16.0 ] } - } - }, - { - "name": "Amplifier Core 2", - "from": [ 5.000000014901161, 3.0, 3.0 ], - "to": [ 6.000000014901161, 4.0, 4.0 ], - "rotation": { "origin": [ 5.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "east": { "texture": "#2", "uv": [ 10.0, 1.0, 11.0, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "west": { "texture": "#2", "uv": [ 3.0, 5.0, 4.0, 6.0 ] }, - "up": { "texture": "#2", "uv": [ 11.0, 1.0, 10.0, 2.0 ] }, - "down": { "texture": "#2", "uv": [ 13.0, 10.0, 14.0, 11.0 ] } - } - }, - { - "name": "Amplifier Glow 2", - "from": [ 4.800000000000001, 2.7999999970197678, 2.7999999970197678 ], - "to": [ 6.200000005960465, 4.200000002980232, 4.200000002980232 ], - "rotation": { "origin": [ 5.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#3", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "up": { "texture": "#3", "uv": [ 7.0, 6.0, 9.0, 8.0 ] }, - "down": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - }, - { - "name": "Retriever Front", - "from": [ 6.0, 2.0, 7.0 ], - "to": [ 10.0, 3.0, 8.0 ], - "rotation": { "origin": [ 8.0, 3.0, 7.0 ], "axis": "x", "angle": -22.5 }, - "faces": { - "north": { "texture": "#6", "uv": [ 2.0, 14.0, 6.0, 15.0 ] }, - "east": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 9.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 13.0, 5.0, 14.0 ] }, - "west": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 8.0 ] }, - "up": { "texture": "#5", "uv": [ 3.0, 15.0, 7.0, 16.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 15.0, 11.0, 16.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_retriever.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_retriever.json index dd1521d1f..828943343 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_retriever.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/chorus_retriever.json @@ -1,42 +1,22 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:item/placement_handgun", + "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/purpur_pillar", - "6": "block/green_concrete_powder" + "0": "create:block/chorus_chrome_mesh", + "cyan_concrete_powder": "block/cyan_concrete_powder" }, "elements": [ { - "name": "Retriever Back", - "from": [ 7.0, 2.0, 8.0 ], - "to": [ 9.0, 4.0, 9.0 ], - "rotation": { "origin": [ 8.0, 3.0, 7.0 ], "axis": "x", "angle": -22.5 }, + "name": "Retriever", + "from": [ 6.5, 3, 6.1 ], + "to": [ 9.5, 4, 8.1 ], "faces": { - "north": { "texture": "#5", "uv": [ 12.0, 4.0, 14.0, 6.0 ] }, - "east": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 10.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 13.0, 3.0, 15.0 ] }, - "west": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 9.0 ] }, - "up": { "texture": "#5", "uv": [ 3.0, 15.0, 5.0, 16.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 15.0, 9.0, 16.0 ] } - } - }, - { - "name": "Retriever Front", - "from": [ 6.0, 2.0, 7.0 ], - "to": [ 10.0, 3.0, 8.0 ], - "rotation": { "origin": [ 8.0, 3.0, 7.0 ], "axis": "x", "angle": -22.5 }, - "faces": { - "north": { "texture": "#6", "uv": [ 2.0, 14.0, 6.0, 15.0 ] }, - "east": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 9.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 13.0, 5.0, 14.0 ] }, - "west": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 8.0 ] }, - "up": { "texture": "#5", "uv": [ 3.0, 15.0, 7.0, 16.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 15.0, 11.0, 16.0 ] } + "north": { "texture": "#cyan_concrete_powder", "uv": [ 5, 11, 8, 12 ] }, + "east": { "texture": "#cyan_concrete_powder", "uv": [ 10, 7, 12, 8 ] }, + "south": { "texture": "#cyan_concrete_powder", "uv": [ 9, 7, 12, 8 ] }, + "west": { "texture": "#cyan_concrete_powder", "uv": [ 10, 7, 12, 8 ] }, + "up": { "texture": "#0", "uv": [ 0, 6, 3, 8 ] }, + "down": { "texture": "#0", "uv": [ 0, 6, 3, 8 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/chorus_scope.json b/src/main/resources/assets/create/models/item/placement_handgun/chorus_scope.json index 0e8ca3f12..a6ee3dd41 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/chorus_scope.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/chorus_scope.json @@ -1,55 +1,37 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "ambientocclusion": true, "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/purpur_pillar", - "6": "block/obsidian" + "mesh": "create:block/chorus_chrome_mesh", + "smooth_stone_slab_side": "block/smooth_stone_slab_side" }, "elements": [ { "name": "Scope", - "from": [ 7.500000007450581, 6.0, 6.0 ], - "to": [ 8.50000000745058, 7.0, 12.0 ], + "from": [ 7.5, 7.5, 9.5 ], + "to": [ 8.5, 8.5, 14.5 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "z", "angle": 45.0 }, "faces": { - "north": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 8.0 ] }, - "east": { "texture": "#5", "uv": [ 8.0, 15.0, 14.0, 16.0 ] }, - "south": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 9.0 ] }, - "west": { "texture": "#5", "uv": [ 6.0, 15.0, 12.0, 16.0 ] }, - "up": { "texture": "#5", "uv": [ 15.0, 5.0, 16.0, 11.0 ] }, - "down": { "texture": "#5", "uv": [ 15.0, 4.0, 16.0, 10.0 ] } + "north": { "texture": "#smooth_stone_slab_side", "uv": [ 0, 0, 1, 1 ] }, + "east": { "texture": "#mesh", "uv": [ 8, 1, 9, 6 ], "rotation": 90 }, + "south": { "texture": "#smooth_stone_slab_side", "uv": [ 0, 0, 1, 1 ] }, + "west": { "texture": "#mesh", "uv": [ 7, 1, 8, 6 ], "rotation": 270 }, + "up": { "texture": "#mesh", "uv": [ 7, 1, 8, 6 ] }, + "down": { "texture": "#mesh", "uv": [ 7, 1, 8, 6 ] } } }, { - "name": "Scope Back", - "from": [ 7.200000002980232, 7.0, 10.0 ], - "to": [ 8.800000011920929, 9.0, 12.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "x", "angle": 45.0 }, + "name": "Scope Connector", + "from": [ 7.5, 7, 11 ], + "to": [ 8.5, 8, 12 ], "faces": { - "north": { "texture": "#5", "uv": [ 13.0, 1.0, 15.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 4.0, 2.0, 6.0, 4.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 6.0, 2.6000000089406967, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 4.0, 2.0, 6.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 5.0, 6.0, 6.600000008940697, 8.0 ] }, - "down": { "texture": "#5", "uv": [ 4.0, 4.0, 5.600000008940697, 6.0 ] } - } - }, - { - "name": "ScopeTop", - "from": [ 7.0, 7.0, 9.0 ], - "to": [ 9.0, 9.0, 13.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#6", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#5", "uv": [ 6.0, 3.0, 10.0, 5.0 ] }, - "south": { "texture": "#6", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "west": { "texture": "#5", "uv": [ 10.0, 2.0, 14.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 15.0, 11.0, 13.0, 15.0 ] }, - "down": { "texture": "#5", "uv": [ 10.0, 3.0, 12.0, 7.0 ] } + "north": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "east": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "south": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "west": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "up": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "down": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/core.json b/src/main/resources/assets/create/models/item/placement_handgun/core.json index 6c1bf80ac..0894aea72 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/core.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/core.json @@ -2,36 +2,31 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "create:item/placement_handgun", "textures": { - "0": "block/white_concrete_powder", - "1": "block/white_stained_glass" + "2": "block/white_concrete_powder", + "3": "block/white_stained_glass" }, "elements": [ { - "name": "Rod Front", - "from": [ 7.300000004470348, 4.3000000193715096, 0.5000000074505806 ], - "to": [ 8.699999995529652, 5.700000010430813, 8.50000000745058 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Core", + "from": [ 7.3, 5, 2.7 ], + "to": [ 8.7, 6, 11.7 ], "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.3999999910593033, 1.3999999910593033 ] }, - "east": { "texture": "#0", "uv": [ 4.0, 4.0, 12.0, 5.399999991059303 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.3999999910593033, 1.3999999910593033 ] }, - "west": { "texture": "#0", "uv": [ 1.0, 0.0, 9.0, 1.3999999910593033 ] }, - "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.3999999910593033, 8.0 ] }, - "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.3999999910593033, 8.0 ] } + "north": { "texture": "#2", "uv": [ 6, 5, 7, 6 ] }, + "east": { "texture": "#2", "uv": [ 3, 5, 12, 6 ] }, + "west": { "texture": "#2", "uv": [ 3, 7, 12, 8 ] } } }, { - "name": "Rod Glow", - "from": [ 6.899999998509884, 3.900000013411045, 0.0 ], - "to": [ 9.100000001490116, 6.100000016391277, 7.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Core Glow", + "from": [ 7.1, 4.6, 2.5 ], + "to": [ 8.9, 6.4, 11.4 ], "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.2000000029802322, 2.2000000029802322 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 7.0, 2.2000000029802322 ] }, - "south": { "texture": "#1", "uv": [ 0.0, 0.0, 2.2000000029802322, 2.2000000029802322 ] }, - "west": { "texture": "#1", "uv": [ 0.0, 0.0, 7.0, 2.2000000029802322 ] }, - "up": { "texture": "#1", "uv": [ 0.0, 0.0, 2.2000000029802322, 7.0 ] }, - "down": { "texture": "#1", "uv": [ 0.0, 0.0, 2.2000000029802322, 7.0 ] } + "north": { "texture": "#3", "uv": [ 6, 7, 7.8, 8.8 ] }, + "east": { "texture": "#3", "uv": [ 3, 7, 11.9, 8.8 ] }, + "south": { "texture": "#3", "uv": [ 5, 7, 6.8, 8.8 ] }, + "west": { "texture": "#3", "uv": [ 4, 7, 12.9, 8.8 ] }, + "up": { "texture": "#3", "uv": [ 7, 3, 8.8, 11.9 ] }, + "down": { "texture": "#3", "uv": [ 7, 4, 8.8, 12.9 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator.json index f02eb108c..e2149ed31 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator.json @@ -2,51 +2,61 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/gold_block" + "cog": "minecraft:block/yellow_concrete_powder" }, "elements": [ { - "name": "Accelerator", - "from": [ 6.499999992549419, 5.0, 10.300000004470348 ], - "to": [ 9.49999999254942, 6.0, 15.300000004470348 ], + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], "faces": { - "north": { "texture": "#5", "uv": [ 7.0, 1.0, 10.0, 2.0 ] }, - "south": { "texture": "#5", "uv": [ 6.0, 3.0, 9.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 6.0, 10.0, 9.0, 15.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 0.0, 10.0, 5.0 ] } + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } } }, { - "name": "Accelerator Connector", - "from": [ 6.4000000059604645, 7.300000004470348, 10.300000004470348 ], - "to": [ 9.600000008940697, 8.699999995529652, 11.699999995529652 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "x", "angle": 45.0 }, + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": 45.0 }, "faces": { - "north": { "texture": "#0", "uv": [ 13.0, 1.0, 15.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 4.0, 2.0, 5.399999991059303, 3.3999999910593033 ] }, - "south": { "texture": "#0", "uv": [ 1.0, 6.0, 4.200000002980232, 7.399999991059303 ] }, - "west": { "texture": "#0", "uv": [ 4.0, 2.0, 5.399999991059303, 3.3999999910593033 ] }, - "up": { "texture": "#0", "uv": [ 5.0, 6.0, 8.200000002980232, 7.399999991059303 ] }, - "down": { "texture": "#0", "uv": [ 4.0, 4.0, 7.200000002980232, 5.399999991059303 ] } + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } } }, { - "name": "Accelerator Back Cap", - "from": [ 7.100000001490116, 4.3000000193715096, 15.0 ], - "to": [ 8.699999995529652, 5.900000013411045, 15.399999991059303 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Cog", + "from": [ 7.5, 3, 12 ], + "to": [ 8.5, 8, 14 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, "faces": { - "north": { "texture": "#5", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#5", "uv": [ 12.0, 4.0, 13.0, 6.4000000059604645 ] }, - "south": { "texture": "#5", "uv": [ 11.0, 5.0, 13.0, 7.0 ] }, - "west": { "texture": "#5", "uv": [ 6.0, 2.0, 7.0, 4.4000000059604645 ] }, - "up": { "texture": "#5", "uv": [ 7.0, 6.0, 9.400000005960464, 7.0 ] }, - "down": { "texture": "#5", "uv": [ 9.0, 0.0, 11.400000005960464, 1.0 ] } + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 8 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 5, 9 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 11 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } + } + }, + { + "name": "Cog", + "from": [ 5.5, 5, 12 ], + "to": [ 10.5, 6, 14 ], + "faces": { + "north": { "texture": "#cog", "uv": [ 6, 7, 8, 12 ] }, + "east": { "texture": "#cog", "uv": [ 5, 3, 7, 4 ] }, + "south": { "texture": "#cog", "uv": [ 4, 4, 9, 5 ] }, + "west": { "texture": "#cog", "uv": [ 4, 6, 6, 7 ] }, + "up": { "texture": "#cog", "uv": [ 4, 6, 5, 8 ] }, + "down": { "texture": "#cog", "uv": [ 5, 6, 6, 8 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator_core.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator_core.json deleted file mode 100644 index 272cfe757..000000000 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_accelerator_core.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:item/placement_handgun", - "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/gold_block" - }, - "elements": [ - { - "name": "Accelerator Core", - "from": [ 6.499999992549419, 5.0, 10.300000004470348 ], - "to": [ 9.49999999254942, 6.0, 15.300000004470348 ], - "faces": { - "east": { "texture": "#2", "uv": [ 4.0, 2.0, 9.0, 3.0 ] }, - "west": { "texture": "#2", "uv": [ 7.0, 2.0, 12.0, 3.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier.json index 872ad8fed..fd3285253 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier.json @@ -2,40 +2,33 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/gold_block" + "0": "create:block/blaze_brass_mesh" }, "elements": [ { - "name": "Amplifier", - "from": [ 10.000000014901161, 4.0, 4.0 ], - "to": [ 11.000000014901161, 5.0, 10.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, + "name": "Amplifier Connector", + "from": [ 7, 2, 3 ], + "to": [ 9, 3, 8 ], "faces": { - "north": { "texture": "#5", "uv": [ 1.0, 2.0, 2.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 10.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#5", "uv": [ 7.0, 7.0, 8.0, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 0.0, 1.0, 6.0, 2.0 ] }, - "up": { "texture": "#5", "uv": [ 2.0, 0.0, 1.0, 6.0 ] }, - "down": { "texture": "#5", "uv": [ 13.0, 10.0, 14.0, 16.0 ] } + "north": { "texture": "#0", "uv": [ 1, 3, 3, 4 ] }, + "east": { "texture": "#0", "uv": [ 11, 5, 16, 6 ] }, + "south": { "texture": "#0", "uv": [ 0, 3, 2, 4 ] }, + "west": { "texture": "#0", "uv": [ 0, 5, 5, 6 ] }, + "up": { "texture": "#0", "uv": [ 0, 3, 5, 5 ], "rotation": 90 }, + "down": { "texture": "#0", "uv": [ 0, 3, 5, 5 ], "rotation": 270 } } }, { "name": "Amplifier Connector", - "from": [ 9.800000011920929, 5.0, 8.0 ], - "to": [ 10.800000011920929, 8.0, 9.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, + "from": [ 7, 3, 7 ], + "to": [ 9, 4, 8 ], "faces": { - "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "east": { "texture": "#0", "uv": [ 6.0, 3.0, 7.0, 6.0 ] }, - "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, - "west": { "texture": "#0", "uv": [ 10.0, 2.0, 14.0, 3.0 ] }, - "up": { "texture": "#0", "uv": [ 15.0, 11.0, 14.0, 15.0 ] }, - "down": { "texture": "#0", "uv": [ 10.0, 3.0, 11.0, 4.0 ] } + "north": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 1 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 1 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier_core.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier_core.json deleted file mode 100644 index 247e24a87..000000000 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_amplifier_core.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:item/placement_handgun", - "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/gold_block" - }, - "elements": [ - { - "name": "Amplifier Core", - "from": [ 10.000000014901161, 4.0, 3.0 ], - "to": [ 11.000000014901161, 5.0, 4.0 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "east": { "texture": "#2", "uv": [ 10.0, 1.0, 11.0, 2.0 ] }, - "south": { "texture": "#2", "uv": [ 9.0, 8.0, 10.0, 9.0 ] }, - "west": { "texture": "#2", "uv": [ 3.0, 5.0, 4.0, 6.0 ] }, - "up": { "texture": "#2", "uv": [ 11.0, 1.0, 10.0, 2.0 ] }, - "down": { "texture": "#2", "uv": [ 13.0, 10.0, 14.0, 11.0 ] } - } - }, - { - "name": "Amplifier Glow", - "from": [ 9.8, 3.7999999970197678, 2.7999999970197678 ], - "to": [ 11.200000005960465, 5.200000002980232, 4.200000002980232 ], - "rotation": { "origin": [ 11.0, 4.0, 8.0 ], "axis": "z", "angle": 45.0 }, - "faces": { - "north": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "east": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "south": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] }, - "west": { "texture": "#3", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "up": { "texture": "#3", "uv": [ 7.0, 6.0, 9.0, 8.0 ] }, - "down": { "texture": "#3", "uv": [ 7.0, 7.0, 9.0, 9.0 ] } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_body.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_body.json index b6e6b0559..b72e2b6e3 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_body.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/gold_body.json @@ -3,25 +3,61 @@ "ambientocclusion": true, "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/magma", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian" + "0": "create:block/blaze_brass_mesh" }, "elements": [ { - "name": "Rod Back", - "from": [ 7.0, 4.000000014901161, 7.0 ], - "to": [ 9.0, 6.000000014901161, 14.0 ], - "rotation": { "origin": [ 8.0, 5.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "name": "Connector", + "from": [ 7, 4, 2 ], + "to": [ 9, 5, 12 ], "faces": { - "north": { "texture": "#1", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }, - "east": { "texture": "#1", "uv": [ 0.0, 0.0, 7.0, 2.0 ] }, - "south": { "texture": "#1", "uv": [ 6.0, 7.0, 8.0, 9.0 ] }, - "west": { "texture": "#1", "uv": [ 4.0, 3.0, 11.0, 5.0 ] }, - "up": { "texture": "#1", "uv": [ 6.0, 5.0, 8.0, 12.0 ] }, - "down": { "texture": "#1", "uv": [ 8.0, 6.0, 10.0, 13.0 ] } + "north": { "texture": "#0", "uv": [ 6, 3, 8, 4 ] }, + "east": { "texture": "#0", "uv": [ 6, 5, 16, 6 ] }, + "south": { "texture": "#0", "uv": [ 8, 5, 10, 6 ] }, + "west": { "texture": "#0", "uv": [ 0, 5, 10, 6 ] }, + "up": { "texture": "#0", "uv": [ 3, 3, 13, 5 ], "rotation": 270 }, + "down": { "texture": "#0", "uv": [ 0, 4, 10, 6 ], "rotation": 270 } + } + }, + { + "name": "Rod Back Cap", + "from": [ 7, 4.5, 14 ], + "to": [ 9, 6.5, 15 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } + } + }, + { + "name": "Connector", + "from": [ 7, 6, 2 ], + "to": [ 9, 7, 12 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0, 8, 2, 9 ] }, + "east": { "texture": "#0", "uv": [ 0, 6, 10, 7 ] }, + "south": { "texture": "#0", "uv": [ 0, 7, 2, 8 ] }, + "west": { "texture": "#0", "uv": [ 0, 6, 10, 7 ] }, + "up": { "texture": "#0", "uv": [ 0, 6, 2, 16 ] }, + "down": { "texture": "#0", "uv": [ 0, 6, 2, 16 ] } + } + }, + { + "name": "Rod Back Cap", + "from": [ 7, 4.5, 11 ], + "to": [ 9, 6.5, 12 ], + "rotation": { "origin": [ 8, 5.5, 8 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "east": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "south": { "texture": "#0", "uv": [ 0, 0, 2, 2 ] }, + "west": { "texture": "#0", "uv": [ 0, 0, 1, 2 ] }, + "up": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] }, + "down": { "texture": "#0", "uv": [ 0, 0, 2, 1 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_retriever.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_retriever.json index eafe1f4ea..ed9089678 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_retriever.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/gold_retriever.json @@ -2,27 +2,21 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "create:item/placement_handgun", "textures": { - "0": "block/anvil", - "1": "block/gray_concrete_powder", - "2": "block/white_concrete_powder", - "3": "block/white_stained_glass", - "4": "block/obsidian", - "5": "block/gold_block", - "6": "block/redstone_block" + "0": "create:block/blaze_brass_mesh", + "cyan_concrete_powder": "block/cyan_concrete_powder" }, "elements": [ { - "name": "Retriever Back", - "from": [ 7.0, 2.0, 8.0 ], - "to": [ 9.0, 4.0, 9.0 ], - "rotation": { "origin": [ 8.0, 3.0, 7.0 ], "axis": "x", "angle": -22.5 }, + "name": "Retriever", + "from": [ 6.5, 3, 6.1 ], + "to": [ 9.5, 4, 8.1 ], "faces": { - "north": { "texture": "#6", "uv": [ 12.0, 4.0, 14.0, 6.0 ] }, - "east": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 10.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 13.0, 3.0, 15.0 ] }, - "west": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 9.0 ] }, - "up": { "texture": "#5", "uv": [ 3.0, 15.0, 5.0, 16.0 ] }, - "down": { "texture": "#5", "uv": [ 7.0, 15.0, 9.0, 16.0 ] } + "north": { "texture": "#cyan_concrete_powder", "uv": [ 5, 11, 8, 12 ] }, + "east": { "texture": "#cyan_concrete_powder", "uv": [ 10, 7, 12, 8 ] }, + "south": { "texture": "#cyan_concrete_powder", "uv": [ 9, 7, 12, 8 ] }, + "west": { "texture": "#cyan_concrete_powder", "uv": [ 10, 7, 12, 8 ] }, + "up": { "texture": "#0", "uv": [ 0, 6, 3, 8 ] }, + "down": { "texture": "#0", "uv": [ 0, 6, 3, 8 ] } } } ] diff --git a/src/main/resources/assets/create/models/item/placement_handgun/gold_scope.json b/src/main/resources/assets/create/models/item/placement_handgun/gold_scope.json index e6fc27ea0..685ecbd33 100644 --- a/src/main/resources/assets/create/models/item/placement_handgun/gold_scope.json +++ b/src/main/resources/assets/create/models/item/placement_handgun/gold_scope.json @@ -1,49 +1,37 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "ambientocclusion": true, "parent": "create:item/placement_handgun", "textures": { - "3": "block/white_concrete", - "5": "block/gold_block" + "mesh": "create:block/blaze_brass_mesh", + "smooth_stone_slab_side": "block/smooth_stone_slab_side" }, "elements": [ { "name": "Scope", - "from": [ 7.500000007450581, 6.0, 6.0 ], - "to": [ 8.50000000745058, 7.0, 12.0 ], + "from": [ 7.5, 7.5, 9.5 ], + "to": [ 8.5, 8.5, 14.5 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "z", "angle": 45.0 }, "faces": { - "north": { "texture": "#5", "uv": [ 15.0, 7.0, 16.0, 8.0 ] }, - "east": { "texture": "#5", "uv": [ 8.0, 15.0, 14.0, 16.0 ] }, - "south": { "texture": "#5", "uv": [ 15.0, 8.0, 16.0, 9.0 ] }, - "west": { "texture": "#5", "uv": [ 6.0, 15.0, 12.0, 16.0 ] }, - "up": { "texture": "#5", "uv": [ 15.0, 5.0, 16.0, 11.0 ] }, - "down": { "texture": "#5", "uv": [ 15.0, 4.0, 16.0, 10.0 ] } + "north": { "texture": "#smooth_stone_slab_side", "uv": [ 0, 0, 1, 1 ] }, + "east": { "texture": "#mesh", "uv": [ 8, 1, 9, 6 ], "rotation": 90 }, + "south": { "texture": "#smooth_stone_slab_side", "uv": [ 0, 0, 1, 1 ] }, + "west": { "texture": "#mesh", "uv": [ 7, 1, 8, 6 ], "rotation": 270 }, + "up": { "texture": "#mesh", "uv": [ 7, 1, 8, 6 ] }, + "down": { "texture": "#mesh", "uv": [ 7, 1, 8, 6 ] } } }, { - "name": "Scope Back", - "from": [ 7.200000002980232, 7.0, 10.0 ], - "to": [ 8.800000011920929, 9.0, 12.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "x", "angle": 45.0 }, + "name": "Scope Connector", + "from": [ 7.5, 7, 11 ], + "to": [ 8.5, 8, 12 ], "faces": { - "north": { "texture": "#5", "uv": [ 13.0, 1.0, 15.0, 3.0 ] }, - "east": { "texture": "#5", "uv": [ 4.0, 2.0, 6.0, 4.0 ] }, - "south": { "texture": "#5", "uv": [ 1.0, 6.0, 2.6000000089406967, 8.0 ] }, - "west": { "texture": "#5", "uv": [ 4.0, 2.0, 6.0, 4.0 ] }, - "up": { "texture": "#5", "uv": [ 5.0, 6.0, 6.600000008940697, 8.0 ] }, - "down": { "texture": "#5", "uv": [ 4.0, 4.0, 5.600000008940697, 6.0 ] } - } - }, - { - "name": "ScopeTop", - "from": [ 7.500000007450581, 7.0, 9.0 ], - "to": [ 8.50000000745058, 8.0, 13.0 ], - "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "east": { "texture": "#5", "uv": [ 6.0, 3.0, 10.0, 4.0 ] }, - "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, - "west": { "texture": "#5", "uv": [ 10.0, 2.0, 14.0, 3.0 ] }, - "up": { "texture": "#5", "uv": [ 15.0, 11.0, 14.0, 15.0 ] }, - "down": { "texture": "#5", "uv": [ 10.0, 3.0, 11.0, 7.0 ] } + "north": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "east": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "south": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "west": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "up": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] }, + "down": { "texture": "#mesh", "uv": [ 0, 0, 1, 1 ] } } } ] diff --git a/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png b/src/main/resources/assets/create/textures/block/andesite_alloy_mesh.png new file mode 100644 index 0000000000000000000000000000000000000000..c57558cee69a5a627117354d017796a21ce33006 GIT binary patch literal 383 zcmV-_0f7FAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0Tf9@K~y+TU6N_4 zgg^|083*^R@hIN^HiEmN;sM^*WL^yBM^UL_DoKx@wr!nr=Xo|wa~wxe6xVgtb$#DA z97WxI-@zcy^Ld_=BpJsM6b{C53|cqKvcB(wD2nK@L3o;`5aEa~7yL4p7{)1X+a`$h z(pfc-0LcKEAT5RRav9=(uq+E<(=^e8D6+S3b)Orwh!4Y1!r(vkzt9nXH>~T*es*tF zlryTTDnEf)AgRR5qJ)V^sY{^;^usVP3#7N(!(Z<6KVYCTU6X`ZmlpEeP?n`Uh+HDu z>pi$Apnq1)gODVOEpaKhUrD|h_CwMy3JzMAeY&pm6HqBs;vu3~PT_*j4eZAogSPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0trb(K~y+TT~f<# z)G!pa<0N(*Kk|Y>BcxV<5D28QMEwEQtoR&u{35CZf|hyDWHRXt&BS?e)1Xn+ERK%P z@x3|MHvaf(WGbVzE|11kB}TZaDuhrNh5P;9aU9oi%d!N;cI@(4_65&hoPh)$Y~`F+ zmBGmBP&ZV<*ES7h6v%42AkQ>Yp$_86cAOS;6g%%y6$V5wgHp$n-QfH z0(%}m+}#~!TXOj_cC;sxC#{8Bj6EfNC5h`gjB%~2u5*3Cq&Pwgg#M;`{OR)jF3o}@ zgnTm8hb&i7kZ*VQ{8oetP{l!>W}x&#$95M)dbixfqab|`&>%%iL6oN@k8|9$m? zT)a7N+7_;&?K;4wsdW?r7h1uYNv#I`Kf>suHC+0u$wCHd`DX@41bk2c)8!h1o!lUa z$?LPH&=MNU;PFp-UN?gRE}+ob;zBHLrd&!$3D0ZDI=`6!AMoV5jQ;w5MK0c+!z+MN zWFbgAw6BdhVP(w8txQGyw)BL*p3dREHnRob;(7`S+|e-419zE>NB;n5g)`xf#u`EZ O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0t`t+K~y+TU6NgI z(=Zr?lQ?$b@1!lOh6X}nOk50&E6}dEfE)e@zk%O60h*v|)^`0^BSGS%4yR-r2wyxp zd5?Yk+Hv^$`FZP{v9@w`Q@bDx+olPEAkXu%EGY(KbzP%E1z97-JB{Y)&4T!^{}uQ5tuF9}EWYVx+}HNC6E-Q78njs%o<>!%y!% zbDma}!!*~ni0O7dP14%Ay$(E>Fy>qvL;(pRa(?puAh(o+gWQNT;fzX=#w1XZYt9wt z!wfDN4Kqff^5-vddh|w#WH2%z;)2c?A(dd1BneeU`mW_N5sG_{4WkuW`tbJSYP}id z`Fgv}jX{^0HS613=yh4hX9S;lx@?trSZbPxqR04qB~+NPFG8a{rx1*y!^6gi-n*vADRNga6jQ ze7z*6FV6hVTdOJJ&q{J_@##|NG`j74_;NoT}IDc?Q zc}9+(yhJ2|?S0t8CcVC+QJ^+5!citu1PgSD_t5t`xhkOVc<-i+U0i%4uTIXKYp^s7 zLUi26H|_2(o3?kgQLb$W#Ul`+xLyo0Tg*W7V_M*9(Kl`r-0R+*FAfhzzX4uAAIEW; R1QY-O002ovPDHLkV1gH~9~}Sy literal 0 HcmV?d00001