diff --git a/src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeModel.java b/src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeModel.java index b09ca69..4125604 100644 --- a/src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeModel.java +++ b/src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeModel.java @@ -20,6 +20,7 @@ import java.util.function.Function; @SideOnly(Side.CLIENT) +public class DenseCraftingCubeModel implements IModel { private static final ResourceLocation RING_CORNER = texture("ring_corner"); private static final ResourceLocation RING_SIDE_HOR = texture("ring_side_hor"); @@ -39,7 +40,7 @@ class DenseCraftingCubeModel implements IModel { private static final ResourceLocation STORAGE_16384K_LIGHT = naetexture("crafting_storage_16384k_light"); private final BlockDenseCraftingUnit.DenseCraftingUnitType type; - DenseCraftingCubeModel(BlockDenseCraftingUnit.DenseCraftingUnitType type) { + public DenseCraftingCubeModel(BlockDenseCraftingUnit.DenseCraftingUnitType type) { this.type = type; } diff --git a/src/main/java/co/neeve/nae2/common/registration/definitions/Blocks.java b/src/main/java/co/neeve/nae2/common/registration/definitions/Blocks.java index a52e736..5bc77dc 100644 --- a/src/main/java/co/neeve/nae2/common/registration/definitions/Blocks.java +++ b/src/main/java/co/neeve/nae2/common/registration/definitions/Blocks.java @@ -6,13 +6,13 @@ import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; import appeng.bootstrap.definitions.TileEntityDefinition; -import co.neeve.nae2.client.rendering.models.crafting.DenseCraftingCubeRendering; import co.neeve.nae2.client.rendering.tesr.TESRReconstructionChamber; import co.neeve.nae2.common.blocks.BlockDenseCraftingUnit; import co.neeve.nae2.common.blocks.BlockReconstructionChamber; import co.neeve.nae2.common.features.Features; import co.neeve.nae2.common.features.subfeatures.DenseCellFeatures; import co.neeve.nae2.common.registration.registry.Registry; +import co.neeve.nae2.common.registration.registry.rendering.DenseCraftingCubeRendering; import co.neeve.nae2.common.tiles.TileDenseCraftingUnit; import co.neeve.nae2.common.tiles.TileReconstructionChamber; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeRendering.java b/src/main/java/co/neeve/nae2/common/registration/registry/rendering/DenseCraftingCubeRendering.java similarity index 92% rename from src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeRendering.java rename to src/main/java/co/neeve/nae2/common/registration/registry/rendering/DenseCraftingCubeRendering.java index 725719f..de13a6e 100644 --- a/src/main/java/co/neeve/nae2/client/rendering/models/crafting/DenseCraftingCubeRendering.java +++ b/src/main/java/co/neeve/nae2/common/registration/registry/rendering/DenseCraftingCubeRendering.java @@ -1,10 +1,11 @@ -package co.neeve.nae2.client.rendering.models.crafting; +package co.neeve.nae2.common.registration.registry.rendering; import appeng.block.crafting.BlockCraftingUnit; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; import co.neeve.nae2.Tags; +import co.neeve.nae2.client.rendering.models.crafting.DenseCraftingCubeModel; import co.neeve.nae2.common.blocks.BlockDenseCraftingUnit; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -16,7 +17,6 @@ import java.util.HashMap; import java.util.Map; -@SideOnly(Side.CLIENT) public class DenseCraftingCubeRendering extends BlockRenderingCustomizer { private final String registryName; private final BlockDenseCraftingUnit.DenseCraftingUnitType type; @@ -38,6 +38,7 @@ public void customize(IBlockRendering rendering, IItemRendering itemRendering) { rendering.modelCustomizer((loc, model) -> model); } + @SideOnly(Side.CLIENT) private Map mapState(Block block, ModelResourceLocation defaultModel, ModelResourceLocation formedModel) { Map result = new HashMap<>(); diff --git a/src/main/java/co/neeve/nae2/common/registration/registry/rendering/ItemPartRendering.java b/src/main/java/co/neeve/nae2/common/registration/registry/rendering/ItemPartRendering.java index f3c2cbf..20c0bcf 100644 --- a/src/main/java/co/neeve/nae2/common/registration/registry/rendering/ItemPartRendering.java +++ b/src/main/java/co/neeve/nae2/common/registration/registry/rendering/ItemPartRendering.java @@ -38,6 +38,7 @@ public void customize(IItemRendering rendering) { .collect(Collectors.toList())); } + @SideOnly(Side.CLIENT) private ModelResourceLocation getItemMeshDefinition(ItemStack is) { var partType = this.item.getTypeByStack(is); var variant = this.item.variantOf(is.getItemDamage());