diff --git a/src/main/java/com/simibubi/create/AllRecipeTypes.java b/src/main/java/com/simibubi/create/AllRecipeTypes.java index ed0c56b0e..d803d6f4b 100644 --- a/src/main/java/com/simibubi/create/AllRecipeTypes.java +++ b/src/main/java/com/simibubi/create/AllRecipeTypes.java @@ -126,6 +126,8 @@ public enum AllRecipeTypes implements IRecipeTypeInfo { event.register(Registry.RECIPE_TYPE_REGISTRY, helper -> { for (AllRecipeTypes r : AllRecipeTypes.values()) { r.type = r.typeSupplier.get(); + if (r.type == RecipeType.CRAFTING) + continue; helper.register(r.id, r.type); } }); diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index 3903693a5..cb9cb2e48 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -373,13 +373,14 @@ public class AllTags { AllItemTags.VANILLA_STRIPPED_LOGS.add(Items.STRIPPED_ACACIA_LOG, Items.STRIPPED_BIRCH_LOG, Items.STRIPPED_CRIMSON_STEM, Items.STRIPPED_DARK_OAK_LOG, Items.STRIPPED_JUNGLE_LOG, Items.STRIPPED_OAK_LOG, - Items.STRIPPED_SPRUCE_LOG, Items.STRIPPED_WARPED_STEM); + Items.STRIPPED_SPRUCE_LOG, Items.STRIPPED_MANGROVE_LOG, Items.STRIPPED_WARPED_STEM); AllItemTags.VANILLA_STRIPPED_LOGS.includeIn(AllItemTags.STRIPPED_LOGS); AllItemTags.VANILLA_STRIPPED_WOOD.add(Items.STRIPPED_ACACIA_WOOD, Items.STRIPPED_BIRCH_WOOD, Items.STRIPPED_CRIMSON_HYPHAE, Items.STRIPPED_DARK_OAK_WOOD, Items.STRIPPED_JUNGLE_WOOD, - Items.STRIPPED_OAK_WOOD, Items.STRIPPED_SPRUCE_WOOD, Items.STRIPPED_WARPED_HYPHAE); + Items.STRIPPED_OAK_WOOD, Items.STRIPPED_MANGROVE_WOOD, Items.STRIPPED_SPRUCE_WOOD, + Items.STRIPPED_WARPED_HYPHAE); AllItemTags.VANILLA_STRIPPED_WOOD.includeIn(AllItemTags.STRIPPED_WOOD); diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java index 24f30cd2b..2acd54a57 100644 --- a/src/main/java/com/simibubi/create/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/events/ClientEvents.java @@ -404,13 +404,13 @@ public class ClientEvents { @SubscribeEvent public static void registerGuiOverlays(RegisterGuiOverlaysEvent event) { // Register overlays in reverse order - event.registerAbove(VanillaGuiOverlay.AIR_LEVEL.id(), "Create's Remaining Air", CopperBacktankArmorLayer.REMAINING_AIR_OVERLAY); - event.registerAbove(VanillaGuiOverlay.EXPERIENCE_BAR.id(), "Create's Train Driver HUD", TrainHUD.OVERLAY); - event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "Create's Goggle Information", GoggleOverlayRenderer.OVERLAY); - event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "Create's Blueprints", BlueprintOverlayRenderer.OVERLAY); - event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "Create's Linked Controller", LinkedControllerClientHandler.OVERLAY); - event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "Create's Schematics", CreateClient.SCHEMATIC_HANDLER.getOverlayRenderer()); - event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "Create's Toolboxes", ToolboxHandlerClient.OVERLAY); + event.registerAbove(VanillaGuiOverlay.AIR_LEVEL.id(), "remaining_air", CopperBacktankArmorLayer.REMAINING_AIR_OVERLAY); + event.registerAbove(VanillaGuiOverlay.EXPERIENCE_BAR.id(), "train_hud", TrainHUD.OVERLAY); + event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "goggle_info", GoggleOverlayRenderer.OVERLAY); + event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "blueprint", BlueprintOverlayRenderer.OVERLAY); + event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "linked_controller", LinkedControllerClientHandler.OVERLAY); + event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "schematic", CreateClient.SCHEMATIC_HANDLER.getOverlayRenderer()); + event.registerAbove(VanillaGuiOverlay.HOTBAR.id(), "toolbox", ToolboxHandlerClient.OVERLAY); } @SubscribeEvent diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index 04e1fc639..e571e4244 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -7,6 +7,7 @@ import java.util.IdentityHashMap; import java.util.Map; import java.util.Map.Entry; import java.util.function.BiConsumer; +import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -42,6 +43,8 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour.Properties; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; +import net.minecraftforge.fluids.FluidType; import net.minecraftforge.fluids.ForgeFlowingFluid; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -175,14 +178,15 @@ public class CreateRegistrate extends AbstractRegistrate { public FluidBuilder virtualFluid(String name) { return entry(name, - c -> new VirtualFluidBuilder<>(self(), self(), name, c, Create.asResource("fluid/" + name + "_still"), - Create.asResource("fluid/" + name + "_flow"), null, VirtualFluid::new)); + c -> new VirtualFluidBuilder(self(), self(), name, c, + Create.asResource("fluid/" + name + "_still"), Create.asResource("fluid/" + name + "_flow"), + CreateRegistrate::defaultFluidType, VirtualFluid::new)); } public FluidBuilder virtualFluid(String name, ResourceLocation still, ResourceLocation flow) { - return entry(name, - c -> new VirtualFluidBuilder<>(self(), self(), name, c, still, flow, null, VirtualFluid::new)); + return entry(name, c -> new VirtualFluidBuilder<>(self(), self(), name, c, still, flow, + CreateRegistrate::defaultFluidType, VirtualFluid::new)); } public FluidBuilder standardFluid(String name) { @@ -195,6 +199,26 @@ public class CreateRegistrate extends AbstractRegistrate { typeFactory); } + public static FluidType defaultFluidType(FluidType.Properties properties, ResourceLocation stillTexture, + ResourceLocation flowingTexture) { + return new FluidType(properties) { + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new IClientFluidTypeExtensions() { + @Override + public ResourceLocation getStillTexture() { + return stillTexture; + } + + @Override + public ResourceLocation getFlowingTexture() { + return flowingTexture; + } + }); + } + }; + } + /* Util */ public static NonNullConsumer casingConnectivity( diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 2da249596..6dd8b0150 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -20,6 +20,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { JUNGLE_WOOD = stripAndMakePlanks(Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.JUNGLE_PLANKS), ACACIA_WOOD = stripAndMakePlanks(Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD, Blocks.ACACIA_PLANKS), DARK_OAK_WOOD = stripAndMakePlanks(Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.DARK_OAK_PLANKS), + MANGROVE_WOOD = stripAndMakePlanks(Blocks.MANGROVE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD, Blocks.MANGROVE_PLANKS), CRIMSON_WOOD = stripAndMakePlanks(Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS), WARPED_WOOD = stripAndMakePlanks(Blocks.WARPED_HYPHAE, Blocks.STRIPPED_WARPED_HYPHAE, Blocks.WARPED_PLANKS), @@ -29,6 +30,7 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { JUNGLE_LOG = stripAndMakePlanks(Blocks.JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_LOG, Blocks.JUNGLE_PLANKS), ACACIA_LOG = stripAndMakePlanks(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG, Blocks.ACACIA_PLANKS), DARK_OAK_LOG = stripAndMakePlanks(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.DARK_OAK_PLANKS), + MANGROVE_LOG = stripAndMakePlanks(Blocks.MANGROVE_LOG, Blocks.STRIPPED_MANGROVE_LOG, Blocks.MANGROVE_PLANKS), CRIMSON_LOG = stripAndMakePlanks(Blocks.CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_PLANKS), WARPED_LOG = stripAndMakePlanks(Blocks.WARPED_STEM, Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_PLANKS), diff --git a/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java index dff3c0741..7363000af 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java @@ -1,7 +1,6 @@ package com.simibubi.create.foundation.mixin; import java.lang.ref.Reference; -import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -23,6 +22,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.sounds.SoundEvent; +import net.minecraft.util.RandomSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.MoverType; import net.minecraft.world.entity.player.Player; @@ -44,7 +44,7 @@ public abstract class EntityContraptionInteractionMixin extends CapabilityProvid @Final @Shadow - protected Random random; + protected RandomSource random; @Shadow private float nextStep; diff --git a/src/main/resources/assets/create/models/block/blaze_burner/block.json b/src/main/resources/assets/create/models/block/blaze_burner/block.json index d068693ff..bf4ac65bd 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/block.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/block.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/blaze_cage.obj", "textures": { "0": "create:block/blaze_heater_brazier", diff --git a/src/main/resources/assets/create/models/block/blaze_burner/block_with_blaze.json b/src/main/resources/assets/create/models/block/blaze_burner/block_with_blaze.json index efff713bc..95eaabaa2 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/block_with_blaze.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/block_with_blaze.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/item.obj", "textures": { "0": "create:block/blaze_heater_brazier", diff --git a/src/main/resources/assets/create/models/block/blaze_burner/block_with_fire.json b/src/main/resources/assets/create/models/block/blaze_burner/block_with_fire.json index 6538543e7..ea0e23928 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/block_with_fire.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/block_with_fire.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/campfire.obj", "textures": { "0": "create:block/blaze_heater_brazier", diff --git a/src/main/resources/assets/create/models/block/blaze_burner/block_with_soul_fire.json b/src/main/resources/assets/create/models/block/blaze_burner/block_with_soul_fire.json index d5c2ebf34..4b3180f6b 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/block_with_soul_fire.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/block_with_soul_fire.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/campfire.obj", "textures": { "0": "create:block/blaze_heater_brazier_soul", diff --git a/src/main/resources/assets/create/models/block/blaze_burner/flame.json b/src/main/resources/assets/create/models/block/blaze_burner/flame.json index b520161d7..c111c8b3a 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/flame.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/flame.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/blaze_flame.obj", "textures": { "0": "create:block/blaze_burner_flame" diff --git a/src/main/resources/assets/create/models/block/blaze_burner/rods_large.json b/src/main/resources/assets/create/models/block/blaze_burner/rods_large.json index 8a2e5b3f3..625642281 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/rods_large.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/rods_large.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/blaze_rods_large.obj", "textures": { "0": "create:block/blaze_active" diff --git a/src/main/resources/assets/create/models/block/blaze_burner/rods_small.json b/src/main/resources/assets/create/models/block/blaze_burner/rods_small.json index 09a6e9767..285fbff7c 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/rods_small.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/rods_small.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/blaze_rods_small.obj", "textures": { "0": "create:block/blaze_active" diff --git a/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_large.json b/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_large.json index 971443123..0b3b4c045 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_large.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_large.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/blaze_rods_large.obj", "textures": { "0": "create:block/blaze_super" diff --git a/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_small.json b/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_small.json index 47e6ef7fc..3a1ceb70d 100644 --- a/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_small.json +++ b/src/main/resources/assets/create/models/block/blaze_burner/superheated_rods_small.json @@ -1,7 +1,7 @@ { "parent": "block/block", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/blaze_burner/blaze_rods_small.obj", "textures": { "0": "create:block/blaze_super" diff --git a/src/main/resources/assets/create/models/block/flywheel/block.json b/src/main/resources/assets/create/models/block/flywheel/block.json index 4add27c0c..ee0e2e49f 100644 --- a/src/main/resources/assets/create/models/block/flywheel/block.json +++ b/src/main/resources/assets/create/models/block/flywheel/block.json @@ -1,6 +1,6 @@ { "parent": "create:block/flywheel/flywheel", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/flywheel/flywheel_shaftless.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/flywheel/item.json b/src/main/resources/assets/create/models/block/flywheel/item.json index 36e6e75e2..054c1efd0 100644 --- a/src/main/resources/assets/create/models/block/flywheel/item.json +++ b/src/main/resources/assets/create/models/block/flywheel/item.json @@ -1,7 +1,7 @@ { "parent": "create:block/flywheel/flywheel", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/flywheel/flywheel.obj", "display": { "gui": { diff --git a/src/main/resources/assets/create/models/block/track/ascending.json b/src/main/resources/assets/create/models/block/track/ascending.json index b5232533a..9e9373d9f 100644 --- a/src/main/resources/assets/create/models/block/track/ascending.json +++ b/src/main/resources/assets/create/models/block/track/ascending.json @@ -1,7 +1,7 @@ { "loader": "forge:obj", "ambientocclusion": false, - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/ascending.obj", "textures": { "0": "create:block/standard_track", diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.json b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.json index b4ea2f414..23542b463 100644 --- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.json +++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/bogey/textures", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/bogey/bogey_drive.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.json b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.json index 7ac2000a1..37fd4ec94 100644 --- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.json +++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_piston.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/bogey/textures", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/bogey/bogey_drive_piston.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.json b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.json index 203caf372..6a620cc40 100644 --- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.json +++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/bogey/textures", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/bogey/bogey_drive_wheel.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.json b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.json index 9cfafddfb..cb5eae82d 100644 --- a/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.json +++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_drive_wheel_pin.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/bogey/textures", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/bogey/bogey_drive_wheel_pin.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.json b/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.json index f9b2073b1..0a64ff3ff 100644 --- a/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.json +++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_frame.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/bogey/textures", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/bogey/bogey_frame.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.json b/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.json index fd8f602ff..759fb73c9 100644 --- a/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.json +++ b/src/main/resources/assets/create/models/block/track/bogey/bogey_wheel.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/bogey/textures", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/bogey/bogey_wheel.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/cross_d1_xo.json b/src/main/resources/assets/create/models/block/track/cross_d1_xo.json index 96ced4cc2..8ae284d70 100644 --- a/src/main/resources/assets/create/models/block/track/cross_d1_xo.json +++ b/src/main/resources/assets/create/models/block/track/cross_d1_xo.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/cross_d1_xo.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/cross_d1_zo.json b/src/main/resources/assets/create/models/block/track/cross_d1_zo.json index 2c8a79c55..74f5e6482 100644 --- a/src/main/resources/assets/create/models/block/track/cross_d1_zo.json +++ b/src/main/resources/assets/create/models/block/track/cross_d1_zo.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/cross_d1_zo.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/cross_d2_xo.json b/src/main/resources/assets/create/models/block/track/cross_d2_xo.json index 6437cfc98..33b170ec0 100644 --- a/src/main/resources/assets/create/models/block/track/cross_d2_xo.json +++ b/src/main/resources/assets/create/models/block/track/cross_d2_xo.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/cross_d2_xo.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/cross_d2_zo.json b/src/main/resources/assets/create/models/block/track/cross_d2_zo.json index 03290ed4c..4bd885877 100644 --- a/src/main/resources/assets/create/models/block/track/cross_d2_zo.json +++ b/src/main/resources/assets/create/models/block/track/cross_d2_zo.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/cross_d2_zo.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/cross_diag.json b/src/main/resources/assets/create/models/block/track/cross_diag.json index 172e7325e..89f77fd84 100644 --- a/src/main/resources/assets/create/models/block/track/cross_diag.json +++ b/src/main/resources/assets/create/models/block/track/cross_diag.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/cross_diag.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/diag.json b/src/main/resources/assets/create/models/block/track/diag.json index c9a00029c..755ce9639 100644 --- a/src/main/resources/assets/create/models/block/track/diag.json +++ b/src/main/resources/assets/create/models/block/track/diag.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/diag.obj" } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/track/diag_2.json b/src/main/resources/assets/create/models/block/track/diag_2.json index 6f6ff1165..50f81215f 100644 --- a/src/main/resources/assets/create/models/block/track/diag_2.json +++ b/src/main/resources/assets/create/models/block/track/diag_2.json @@ -1,6 +1,6 @@ { "parent": "create:block/track/obj_track", "loader": "forge:obj", - "flip-v": true, + "flip_v": true, "model": "create:models/block/track/diag_2.obj" } \ No newline at end of file