fix slicer visual issue (#227)

Author: PssbleTrngle

.gitignore

@@ -21,8 +21,9 @@ build
 eclipse
 run
 runs
+.kotlin
 
 # Files from Forge MDK
 forge*changelog.txt
 
-**.env
+**.env

src/main/java/com/possible_triangle/sliceanddice/SliceAndDice.java

@@ -2,6 +2,7 @@
 
 import com.simibubi.create.foundation.data.CreateRegistrate;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
@@ -19,11 +20,15 @@ public class SliceAndDice {
     public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MOD_ID)
             .defaultCreativeTab((ResourceKey<CreativeModeTab>) null);
 
+    public static ResourceLocation modLoc(String path) {
+        return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
+    }
+
     public SliceAndDice(ModContainer container, IEventBus modBus, Dist dist) {
         REGISTRATE.registerEventListeners(modBus);
         Content.INSTANCE.register(container, modBus);
 
-        if(dist.isClient()) {
+        if (dist.isClient()) {
             Content.INSTANCE.clientInit();
         }
     }

src/main/kotlin/com/possible_triangle/sliceanddice/Content.kt

@@ -2,6 +2,7 @@ package com.possible_triangle.sliceanddice
 
 import com.possible_triangle.sliceanddice.SliceAndDice.MOD_ID
 import com.possible_triangle.sliceanddice.SliceAndDice.REGISTRATE
+import com.possible_triangle.sliceanddice.SliceAndDice.modLoc
 import com.possible_triangle.sliceanddice.block.slicer.*
 import com.possible_triangle.sliceanddice.block.sprinkler.SprinkleBehaviour
 import com.possible_triangle.sliceanddice.block.sprinkler.SprinklerBlock
@@ -21,7 +22,6 @@ import com.simibubi.create.AllFluids
 import com.simibubi.create.AllTags
 import com.simibubi.create.api.registry.CreateRegistries
 import com.simibubi.create.api.stress.BlockStressValues
-import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPointType
 import com.simibubi.create.content.processing.AssemblyOperatorBlockItem
 import com.simibubi.create.foundation.data.*
 import com.tterrag.registrate.AbstractRegistrate
@@ -53,13 +53,10 @@ import java.util.function.Supplier
 
 object Content {
 
-    fun modLoc(path: String): ResourceLocation {
-        return ResourceLocation.fromNamespaceAndPath(MOD_ID, path)
-    }
-
     val ALLOWED_TOOLS = TagKey.create(Registries.ITEM, modLoc("allowed_tools"))
 
-    val SLICER_BLOCK = REGISTRATE.block<SlicerBlock>("slicer", ::SlicerBlock).initialProperties(SharedProperties::stone)
+    val SLICER_BLOCK = REGISTRATE.block("slicer", ::SlicerBlock)
+        .initialProperties(SharedProperties::stone)
         .properties(BlockBehaviour.Properties::noOcclusion).transform(TagGen.axeOrPickaxe()).blockstate { c, p ->
             p.simpleBlock(c.entry, AssetLookup.partialBaseModel(c, p))
         }
@@ -77,7 +74,9 @@ object Content {
 
     val SLICER_BLOCK_ENTITY = REGISTRATE.blockEntity("slicer", BlockEntityFactory(::SlicerBlockEntity))
         .visual { SimpleBlockEntityVisualizer.Factory(::SlicerVisual) }
-        .renderer { NonNullFunction { SlicerRenderer(it) } }.validBlock(SLICER_BLOCK).register()
+        .renderer { NonNullFunction { SlicerRenderer(it) } }
+        .validBlock(SLICER_BLOCK)
+        .register()
 
     private fun <T : Recipe<*>> AbstractRegistrate<*>.recipeType(name: String) =
         generic(name, Registries.RECIPE_TYPE) {
@@ -95,12 +94,13 @@ object Content {
         .register()
 
 
-    val WET_AIR = REGISTRATE.block<WetAir>("wet_air", ::WetAir).initialProperties { Blocks.CAVE_AIR }
+    val WET_AIR = REGISTRATE.block("wet_air", ::WetAir)
+        .initialProperties { Blocks.CAVE_AIR }
         .properties { it.randomTicks() }.blockstate { c, p ->
             p.simpleBlock(c.entry, p.models().withExistingParent(c.name, "block/barrier"))
         }.register()
 
-    val SPRINKLER_BLOCK = REGISTRATE.block<SprinklerBlock>("sprinkler", ::SprinklerBlock)
+    val SPRINKLER_BLOCK = REGISTRATE.block("sprinkler", ::SprinklerBlock)
         .initialProperties { SharedProperties.copperMetal() }.transform(TagGen.pickaxeOnly())
         .addLayer { Supplier { RenderType.cutoutMipped() } }
         .blockstate { c, p -> p.simpleBlock(c.entry, AssetLookup.standardModel(c, p)) }
@@ -139,7 +139,7 @@ object Content {
 
     val SLICER_INTERACTION_POINT =
         REGISTRATE
-            .generic<ArmInteractionPointType, SlicerArmInteractionType>(
+            .generic(
                 "slicer",
                 CreateRegistries.ARM_INTERACTION_POINT_TYPE
             ) { SlicerArmInteractionType }

src/main/kotlin/com/possible_triangle/sliceanddice/SlicerPartials.kt

@@ -8,6 +8,6 @@ object SlicerPartials {
         // Only here so the class gets loaded
     }
 
-    val SLICER_HEAD = PartialModel.of(Content.modLoc("block/slicer/head"))
+    val SLICER_HEAD = PartialModel.of(SliceAndDice.modLoc("block/slicer/head"))
 
 }

src/main/kotlin/com/possible_triangle/sliceanddice/compat/FarmersDelightCompat.kt

@@ -64,7 +64,7 @@ class FarmersDelightCompat private constructor() : IRecipeInjector {
         SliceAndDice.LOGGER.debug("Found {} cutting recipes", cuttingRecipes.size)
 
         cuttingRecipes.forEach { (originalID, recipe) ->
-            val id = Content.modLoc("cutting/${originalID.namespace}/${originalID.path}")
+            val id = SliceAndDice.modLoc("cutting/${originalID.namespace}/${originalID.path}")
             add.accept(id, recipe.toBasin(id))
         }
     }
@@ -85,7 +85,7 @@ class FarmersDelightCompat private constructor() : IRecipeInjector {
         val generator = MixingRecipeGenerator(emptyingRecipes)
 
         return cookingRecipes.forEach { (originalID, recipe) ->
-            val id = Content.modLoc("cooking/${originalID.namespace}/${originalID.path}")
+            val id = SliceAndDice.modLoc("cooking/${originalID.namespace}/${originalID.path}")
 
             @Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
             // Cooking recipes do not use the registryAccess

src/main/kotlin/com/possible_triangle/sliceanddice/compat/OverweightFarmingCompat.kt

@@ -1,6 +1,6 @@
 package com.possible_triangle.sliceanddice.compat
 
-import com.possible_triangle.sliceanddice.Content
+import com.possible_triangle.sliceanddice.SliceAndDice
 import com.possible_triangle.sliceanddice.compat.ModCompat.OVERWEIGHT_FARMING
 import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe
 import com.simibubi.create.content.kinetics.deployer.ItemApplicationRecipe
@@ -36,7 +36,7 @@ class OverweightFarmingCompat private constructor() : IRecipeInjector {
         val recipes = MiscEvents.PEELABLES.get().map { (from, to) ->
             val fromId = from.builtInRegistryHolder().key().location()
             val toId = to.builtInRegistryHolder().key().location()
-            val id = Content.modLoc("$OVERWEIGHT_FARMING/peeling/from_${fromId.path}_to_${toId.path}")
+            val id = SliceAndDice.modLoc("$OVERWEIGHT_FARMING/peeling/from_${fromId.path}_to_${toId.path}")
             ItemApplicationRecipe.Builder(::ManualApplicationRecipe, id).let {
                 it.output(to)
                 it.require(from)
@@ -56,7 +56,7 @@ class OverweightFarmingCompat private constructor() : IRecipeInjector {
         MiscEvents.WAXABLES.get().forEach { (from, to) ->
             val fromId = from.builtInRegistryHolder().key().location()
             val toId = to.builtInRegistryHolder().key().location()
-            val id = Content.modLoc("$OVERWEIGHT_FARMING/waxing/from_${fromId.path}_to_${toId.path}")
+            val id = SliceAndDice.modLoc("$OVERWEIGHT_FARMING/waxing/from_${fromId.path}_to_${toId.path}")
             val recipe = ItemApplicationRecipe.Builder(::DeployerApplicationRecipe, id).let {
                 it.output(to)
                 it.require(from)

src/main/kotlin/com/possible_triangle/sliceanddice/compat/jei/CuttingProcessingCategory.kt

@@ -24,7 +24,7 @@ import java.util.function.Supplier
 class CuttingProcessingCategory() :
     CreateRecipeCategory<CuttingProcessingRecipe>(
         Info(
-            RecipeType.createRecipeHolderType(Content.modLoc("slicer")),
+            RecipeType.createRecipeHolderType(SliceAndDice.modLoc("slicer")),
             Component.translatable("${SliceAndDice.MOD_ID}.recipe.slicer"),
             EmptyBackground(177, 85),
             ItemIcon(SLICER),

src/main/kotlin/com/possible_triangle/sliceanddice/compat/jei/JEICompat.kt

@@ -1,6 +1,6 @@
 package com.possible_triangle.sliceanddice.compat.jei
 
-import com.possible_triangle.sliceanddice.Content
+import com.possible_triangle.sliceanddice.SliceAndDice
 import com.possible_triangle.sliceanddice.compat.FarmersDelightCompat
 import com.possible_triangle.sliceanddice.compat.OverweightFarmingCompat
 import com.simibubi.create.AllRecipeTypes
@@ -19,7 +19,7 @@ class JEICompat : IModPlugin {
 
     private val cutting = CuttingProcessingCategory()
 
-    override fun getPluginUid() = Content.modLoc("jei")
+    override fun getPluginUid() = SliceAndDice.modLoc("jei")
 
     override fun registerCategories(registration: IRecipeCategoryRegistration) {
         registration.addRecipeCategories(cutting)

src/main/kotlin/com/possible_triangle/sliceanddice/data/CompatRecipes.kt

@@ -1,6 +1,7 @@
 package com.possible_triangle.sliceanddice.data
 
 import com.possible_triangle.sliceanddice.Content
+import com.possible_triangle.sliceanddice.SliceAndDice
 import com.possible_triangle.sliceanddice.compat.ModCompat
 import com.simibubi.create.AllFluids
 import com.simibubi.create.AllItems
@@ -24,7 +25,7 @@ import vectorwing.farmersdelight.common.registry.ModItems
 object CompatRecipes {
 
     fun generate(output: RegistrateRecipeProvider) {
-        StandardProcessingRecipe.Builder(::FillingRecipe, Content.modLoc("hot_cocoa_from_fluid"))
+        StandardProcessingRecipe.Builder(::FillingRecipe, SliceAndDice.modLoc("hot_cocoa_from_fluid"))
             .require(Items.GLASS_BOTTLE)
             .require(AllFluids.CHOCOLATE.get(), 250)
             .output(ModItems.HOT_COCOA.get())
@@ -45,7 +46,7 @@ object CompatRecipes {
             .withCondition(ModLoadedCondition("thermal_foundation"))
             .build(output)
 
-        StandardProcessingRecipe.Builder(::FillingRecipe, Content.modLoc("rich_soil"))
+        StandardProcessingRecipe.Builder(::FillingRecipe, SliceAndDice.modLoc("rich_soil"))
             .require(ModBlocks.ORGANIC_COMPOST.get())
             .require(Content.FERTILIZER.get(), 500)
             .output(ModBlocks.RICH_SOIL.get())
@@ -61,7 +62,7 @@ object CompatRecipes {
     }
 
     private fun fertilizerMixing(amount: Int, id: String): StandardProcessingRecipe.Builder<MixingRecipe> {
-        return StandardProcessingRecipe.Builder(::MixingRecipe, Content.modLoc("fertilizer/from_$id"))
+        return StandardProcessingRecipe.Builder(::MixingRecipe, SliceAndDice.modLoc("fertilizer/from_$id"))
             .require(Fluids.WATER, amount)
             .output(Content.FERTILIZER.get(), amount)
     }