diff --git a/.github/requirements.txt b/.github/requirements.txt index 2ea94aa1d..32725af06 100644 --- a/.github/requirements.txt +++ b/.github/requirements.txt @@ -1 +1,3 @@ -fire==0.4.0 \ No newline at end of file +fire==0.4.0 +curseuploadpy @ git+https://github.com/MrTJP/curseuploadpy.git@dev +modrinthpy @ git+https://github.com/MrTJP/modrinthpy.git@dev diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 616d2aee9..a3b888c9a 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -32,26 +32,26 @@ jobs: case $release_type in "release") publish_maven=true - publish_curse=true + publish_launchers=true publish_gh_release=true version_format="{major}.{minor}.{patch}" ;; "beta") publish_maven=true - publish_curse=true + publish_launchers=true publish_gh_release=false version_format="{major}.{minor}.{patch}-beta+{increment}" ;; "alpha") publish_maven=true - publish_curse=false + publish_launchers=false publish_gh_release=false version_format="{major}.{minor}.{patch}-alpha+{increment}" ;; *) echo "::warning::Unknown release type: $release_type" publish_maven=false - publish_curse=false + publish_launchers=false publish_gh_release=false version_format="{major}.{minor}.{patch}-$release_type+{increment}" esac @@ -61,7 +61,7 @@ jobs: echo "release_channel=$release_channel" >> $GITHUB_OUTPUT echo "release_type=$release_type" >> $GITHUB_OUTPUT echo "publish_maven=$publish_maven" >> $GITHUB_OUTPUT - echo "publish_curse=$publish_curse" >> $GITHUB_OUTPUT + echo "publish_launchers=$publish_launchers" >> $GITHUB_OUTPUT echo "publish_gh_release=$publish_gh_release" >> $GITHUB_OUTPUT echo "version_format=$version_format" >> $GITHUB_OUTPUT echo "tag_format=$tag_format" >> $GITHUB_OUTPUT @@ -127,13 +127,90 @@ jobs: MAVEN_USER: ${{ secrets.MAVEN_USER }} MAVEN_PASS: ${{ secrets.MAVEN_PASS }} - - name: Curse publish - if: ${{ steps.release_type.outputs.publish_curse == 'true' }} - run: ./gradlew curseforge + - name: Publish to Curse + if: ${{ steps.release_type.outputs.publish_launchers == 'true' }} + run: | + # Base args for all modules + COMMON_ARGS=( \ + -k $API_TOKEN \ + -rt $RELEASE_TYPE \ + -v 'Java 17' \ + -v 1.20.1 \ + -v Forge \ + -v NeoForge \ + -c ./CHANGELOG.md \ + --required-dep codechicken-lib-1-8 \ + --required-dep cb-multipart \ + ) + + # All submodules need PR Core + MODULE_ARGS=( \ + "${COMMON_ARGS[@]}" \ + --required-dep project-red-core \ + ) + + # Fabrication is special and also needs Integration and Transmission + FAB_ARGS=( \ + "${MODULE_ARGS[@]}" \ + --required-dep project-red-integration \ + --required-dep project-red-transmission \ + ) + + python -m curseuploadpy "${COMMON_ARGS[@]}" -p 228702 -f core/build/libs/*-core.jar + python -m curseuploadpy "${MODULE_ARGS[@]}" -p 229048 -f expansion/build/libs/*-expansion.jar + python -m curseuploadpy "${MODULE_ARGS[@]}" -p 229049 -f exploration/build/libs/*-exploration.jar + python -m curseuploadpy "${FAB_ARGS[@]}" -p 230111 -f fabrication/build/libs/*-fabrication.jar + python -m curseuploadpy "${MODULE_ARGS[@]}" -p 229046 -f illumination/build/libs/*-illumination.jar + python -m curseuploadpy "${MODULE_ARGS[@]}" -p 229045 -f integration/build/libs/*-integration.jar + python -m curseuploadpy "${MODULE_ARGS[@]}" -p 478939 -f transmission/build/libs/*-transmission.jar + env: - AUTO_GENERATED_VERSION: ${{ steps.versioning.outputs.version }} - CURSE_RELEASE_TYPE: ${{ steps.release_type.outputs.release_type }} - CURSE_TOKEN: ${{ secrets.CURSE_TOKEN }} + RELEASE_TYPE: ${{ steps.release_type.outputs.release_type }} + API_TOKEN: ${{ secrets.CURSE_TOKEN }} + + + - name: Publish to Modrinth + if: ${{ steps.release_type.outputs.publish_launchers == 'true' }} + run: | + # Base args for all modules + COMMON_ARGS=( \ + -k $API_TOKEN \ + create-version \ + -v "$MOD_VERSION" \ + -c ./CHANGELOG.md \ + -gv 1.20.1 \ + -vt $RELEASE_TYPE \ + -l forge \ + -l neoforge \ + --required-dep codechicken-lib \ + --required-dep cb-multipart \ + ) + + # All submodules need PR Core + MODULE_ARGS=( \ + "${COMMON_ARGS[@]}" \ + --required-dep project-red-core \ + ) + + # Fabrication is special and also needs Integration and Transmission + FAB_ARGS=( \ + "${MODULE_ARGS[@]}" \ + --required-dep project-red-integration \ + --required-dep project-red-transmission \ + ) + + python -m modrinthpy "${COMMON_ARGS[@]}" -p project-red-core -n "Project Red Core v$MOD_VERSION" -f core/build/libs/*-core.jar + python -m modrinthpy "${MODULE_ARGS[@]}" -p project-red-expansion -n "Project Red Expansion v$MOD_VERSION" -f expansion/build/libs/*-expansion.jar + python -m modrinthpy "${MODULE_ARGS[@]}" -p project-red-exploration -n "Project Red Exploration v$MOD_VERSION" -f exploration/build/libs/*-exploration.jar + python -m modrinthpy "${FAB_ARGS[@]}" -p project-red-fabrication -n "Project Red Fabrication v$MOD_VERSION" -f fabrication/build/libs/*-fabrication.jar + python -m modrinthpy "${MODULE_ARGS[@]}" -p project-red-illumination -n "Project Red Illumination v$MOD_VERSION" -f illumination/build/libs/*-illumination.jar + python -m modrinthpy "${MODULE_ARGS[@]}" -p project-red-integration -n "Project Red Integration v$MOD_VERSION" -f integration/build/libs/*-integration.jar + python -m modrinthpy "${MODULE_ARGS[@]}" -p project-red-transmission -n "Project Red Transmission v$MOD_VERSION" -f transmission/build/libs/*-transmission.jar + + env: + RELEASE_TYPE: ${{ steps.release_type.outputs.release_type }} + API_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + MOD_VERSION: ${{ steps.versioning.outputs.version }} - name: Tag and Release if: ${{ steps.release_type.outputs.publish_gh_release == 'true' }} diff --git a/.gitignore b/.gitignore index 12188044c..ced8255e1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ Icon? ehthumbs.db Thumbs.db #gradle stuff -/.gradle +**/.gradle /build/ /*/build/ /run/ diff --git a/core/build.gradle b/core/build.gradle index 3519c25f9..415415773 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' } String mod_id = 'projectred_core' @@ -46,23 +45,3 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Core - project { - id = '228702' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'codechicken-lib-1-8' // CCL is required for everything - requiredDependency 'cb-multipart' // CBMultipart is required for everything - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} diff --git a/core/src/main/java/mrtjp/projectred/core/inventory/BaseInventory.java b/core/src/main/java/mrtjp/projectred/core/inventory/BaseInventory.java index 070b8a278..00039de79 100644 --- a/core/src/main/java/mrtjp/projectred/core/inventory/BaseInventory.java +++ b/core/src/main/java/mrtjp/projectred/core/inventory/BaseInventory.java @@ -59,8 +59,8 @@ public void loadFrom(CompoundTag parent, String key) { // Check if list-format tags are present ListTag itemList = parent.getList(key, 10); if (!itemList.isEmpty()) { - ProjectRedCore.LOGGER.warn("Inventory {} loaded from non-ordered data. Its contents may have shuffled", this); fromTag(itemList); + ProjectRedCore.LOGGER.warn("Inventory {} loaded from non-ordered data. Its contents may have shuffled", this); } else { // Otherwise, use new compound format load(parent.getCompound(key)); @@ -70,4 +70,18 @@ public void loadFrom(CompoundTag parent, String key) { public static int getItemCount(CompoundTag tag) { return tag.contains(TAG_ITEM_COUNT) ? tag.getInt(TAG_ITEM_COUNT) : tag.getList(TAG_ITEMS, 10).size(); //TODO remove legacy support } + + //region Deprecate vanilla save/load as it does not load back to correct slots + @Override + @Deprecated // Use saveTo or save + public ListTag createTag() { + return super.createTag(); + } + + @Override + @Deprecated // Use loadFrom or load + public void fromTag(ListTag pContainerNbt) { + super.fromTag(pContainerNbt); + } + //endregion } diff --git a/expansion/build.gradle b/expansion/build.gradle index a86950e82..ffe280382 100644 --- a/expansion/build.gradle +++ b/expansion/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' id 'org.spongepowered.mixin' } @@ -45,22 +44,3 @@ mixin { debug.verbose = true debug.export = true } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Expansion - project { - id = '229048' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'project-red-core' - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} \ No newline at end of file diff --git a/expansion/src/main/generated/.cache/e9b9ccd445df9bc8a5c2450219d2603d62d31dd5 b/expansion/src/main/generated/.cache/e9b9ccd445df9bc8a5c2450219d2603d62d31dd5 index c678fb83b..3eab588d1 100644 --- a/expansion/src/main/generated/.cache/e9b9ccd445df9bc8a5c2450219d2603d62d31dd5 +++ b/expansion/src/main/generated/.cache/e9b9ccd445df9bc8a5c2450219d2603d62d31dd5 @@ -1,4 +1,4 @@ -// 1.20.1 2024-07-17T09:25:42.182432 projectred_expansion Item models. +// 1.20.1 2024-11-20T09:27:37.993874 projectred_expansion Item models. 599e9047cbf1215359e3106b1a6a0757a569ffc9 assets/projectred_expansion/models/item/auto_crafter.json 736ab07c8745c163e8a3cb90abc9308466032009 assets/projectred_expansion/models/item/battery.json d887cd7b776f1227da04cf267bf0a48dbc706027 assets/projectred_expansion/models/item/battery_box.json @@ -16,10 +16,10 @@ ca8ee7426c8d4b145e75bc0bebca77c90e05779e assets/projectred_expansion/models/item f8ad62a7aa4f5ae87d36e422722c4ffbf46d22e1 assets/projectred_expansion/models/item/electric_screwdriver.json c04ad8c2f44fd4f5a6ea7c5bb9ddf98629332a84 assets/projectred_expansion/models/item/empty_battery.json 8adfe244bf33706f67d587942e9179b74cf38fd0 assets/projectred_expansion/models/item/fire_starter.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_expansion/models/item/frame.json +432462cb1b080b869c472c0e8f7495e9b4e1d638 assets/projectred_expansion/models/item/frame.json 933ec48f28e2627aefbdcaa7d989eeac271ad282 assets/projectred_expansion/models/item/frame_actuator.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_expansion/models/item/frame_motor.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_expansion/models/item/pneumatic_tube.json +78ea8ea37f9467201dc2e05ef372f4403ccbadb2 assets/projectred_expansion/models/item/frame_motor.json +efabd61ed85b4d67f546ea6cfb90d9f5f17773cc assets/projectred_expansion/models/item/pneumatic_tube.json 9457da7d0b200c883ca98241d9bf155043221c53 assets/projectred_expansion/models/item/project_bench.json 5d8ae0bcb189be1eb7ce726fc4d28637dcdfaac8 assets/projectred_expansion/models/item/recipe_plan.json 000ee856d11f86a527eb92dd81e20dee640de756 assets/projectred_expansion/models/item/recipe_plan_written.json diff --git a/expansion/src/main/generated/assets/projectred_expansion/models/item/frame.json b/expansion/src/main/generated/assets/projectred_expansion/models/item/frame.json index 1bcbb312f..257f8df06 100644 --- a/expansion/src/main/generated/assets/projectred_expansion/models/item/frame.json +++ b/expansion/src/main/generated/assets/projectred_expansion/models/item/frame.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.expansion.client.FrameBlockRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/expansion/src/main/generated/assets/projectred_expansion/models/item/frame_motor.json b/expansion/src/main/generated/assets/projectred_expansion/models/item/frame_motor.json index 1bcbb312f..1d3d1288f 100644 --- a/expansion/src/main/generated/assets/projectred_expansion/models/item/frame_motor.json +++ b/expansion/src/main/generated/assets/projectred_expansion/models/item/frame_motor.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.expansion.client.FrameMotorBlockRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/expansion/src/main/generated/assets/projectred_expansion/models/item/pneumatic_tube.json b/expansion/src/main/generated/assets/projectred_expansion/models/item/pneumatic_tube.json index 1bcbb312f..258d76646 100644 --- a/expansion/src/main/generated/assets/projectred_expansion/models/item/pneumatic_tube.json +++ b/expansion/src/main/generated/assets/projectred_expansion/models/item/pneumatic_tube.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.expansion.client.TubePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/MovementManager.java b/expansion/src/main/java/mrtjp/projectred/expansion/MovementManager.java index 1163b2e9a..f09a6e8f7 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/MovementManager.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/MovementManager.java @@ -37,6 +37,7 @@ import net.minecraftforge.event.level.ChunkWatchEvent; import net.minecraftforge.event.level.LevelEvent; +import javax.annotation.Nullable; import java.util.*; import java.util.function.Consumer; @@ -65,7 +66,7 @@ public static MovementManager getInstance(Level level) { return map.computeIfAbsent(level.dimension(), MovementManager::new); } - public static MovementManager getClientInstanceNullable() { + public static @Nullable MovementManager getClientInstanceNullable() { var clientLevel = Minecraft.getInstance().level; if (clientLevel == null) { return null; diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/MovementRegistry.java b/expansion/src/main/java/mrtjp/projectred/expansion/MovementRegistry.java index 8d558e5ad..d6e1b55be 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/MovementRegistry.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/MovementRegistry.java @@ -67,6 +67,11 @@ public static void registerFrameInteraction(FrameInteraction interaction) { BlockEntity be = level.getBlockEntity(pos); if (be instanceof MovementController mbe) return mbe; + if (be != null) { + LazyOptional cap = be.getCapability(IExpansionAPI.MOVEMENT_CONTROLLER_CAPABILITY); + if (cap.isPresent()) return cap.orElseThrow(() -> new RuntimeException("??")); + } + return null; } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java index d6c564d13..a3e3f5a66 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java @@ -26,7 +26,7 @@ public class FrameBlockRenderer implements ICCBlockRenderer, IItemRenderer { public static final FrameBlockRenderer INSTANCE = new FrameBlockRenderer(); - private FrameBlockRenderer() { + public FrameBlockRenderer() { } //region ICCBlockRenderer diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java index 763cb6406..25004423d 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java @@ -38,7 +38,7 @@ public class FrameMotorBlockRenderer extends FullyOrientableBlockRenderer { private static @Nullable MultiIconTransformation iconT2; private static @Nullable MultiIconTransformation iconT3; - private FrameMotorBlockRenderer() { + public FrameMotorBlockRenderer() { } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/client/TubePartItemRenderer.java b/expansion/src/main/java/mrtjp/projectred/expansion/client/TubePartItemRenderer.java index 81f0e3487..92ce170b4 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/client/TubePartItemRenderer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/client/TubePartItemRenderer.java @@ -15,9 +15,7 @@ public class TubePartItemRenderer implements IItemRenderer { - public static final TubePartItemRenderer INSTANCE = new TubePartItemRenderer(); - - private TubePartItemRenderer() { } + public TubePartItemRenderer() { } @Override public boolean useAmbientOcclusion() { diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java index 3af62be5c..0c4f2b782 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java @@ -2,6 +2,9 @@ import codechicken.lib.datagen.ItemModelProvider; import mrtjp.projectred.expansion.TubeType; +import mrtjp.projectred.expansion.client.FrameBlockRenderer; +import mrtjp.projectred.expansion.client.FrameMotorBlockRenderer; +import mrtjp.projectred.expansion.client.TubePartItemRenderer; import net.minecraft.data.PackOutput; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -34,11 +37,11 @@ protected void registerModels() { simpleItemBlock(BLOCK_BREAKER_BLOCK.get()); simpleItemBlock(DEPLOYER_BLOCK.get()); - generated(FRAME_BLOCK.get()).noTexture(); - generated(FRAME_MOTOR_BLOCK.get()).noTexture(); + clazz(FRAME_BLOCK.get(), FrameBlockRenderer.class); + clazz(FRAME_MOTOR_BLOCK.get(), FrameMotorBlockRenderer.class); for (TubeType type : TubeType.values()) { - generated(type.getItem()).noTexture(); + clazz(type.getItem(), TubePartItemRenderer.class); } generated(EMPTY_BATTERY_ITEM); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java index a7db5889b..a62f22b35 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java @@ -1,6 +1,5 @@ package mrtjp.projectred.expansion.init; -import codechicken.lib.model.ModelRegistryHelper; import codechicken.lib.render.block.BlockRenderingRegistry; import codechicken.multipart.api.MultipartClientRegistry; import mrtjp.projectred.expansion.GraphDebugManager; @@ -15,15 +14,11 @@ import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.item.ItemProperties; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.Objects; import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; @@ -37,8 +32,6 @@ public class ExpansionClientInit { public static final ResourceLocation ITEM_MODEL_PROPERTY_CHARGE_LEVEL = new ResourceLocation(MOD_ID, "charge_level"); public static final ResourceLocation ITEM_MODEL_PROPERTY_WRITTEN_RECIPE_PLAN = new ResourceLocation(MOD_ID, "written"); - private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); - public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -78,10 +71,6 @@ private static void clientSetup(final FMLClientSetupEvent event) { BlockRenderingRegistry.registerRenderer(FRAME_MOTOR_BLOCK.get(), FrameMotorBlockRenderer.INSTANCE); BlockRenderingRegistry.registerGlobalRenderer(MovingBlockSuppressorRenderer.INSTANCE); - // Register item renderers - MODEL_HELPER.register(new ModelResourceLocation(ForgeRegistries.BLOCKS.getKey(FRAME_BLOCK.get()), "inventory"), FrameBlockRenderer.INSTANCE); - MODEL_HELPER.register(new ModelResourceLocation(ForgeRegistries.BLOCKS.getKey(FRAME_MOTOR_BLOCK.get()), "inventory"), FrameMotorBlockRenderer.INSTANCE); - // Register part renderers MultipartClientRegistry.register(FRAME_PART.get(), FramePartRenderer.INSTANCE); @@ -89,9 +78,6 @@ private static void clientSetup(final FMLClientSetupEvent event) { for (TubeType type : TubeType.values()) { // Block renderer MultipartClientRegistry.register(type.getPartType(), SneakyUtils.unsafeCast(TubePartRenderer.INSTANCE)); - - // Item renderer - MODEL_HELPER.register(new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject().getId()), "inventory"), TubePartItemRenderer.INSTANCE); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseFrameMoverTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseFrameMoverTile.java index 59dc543c9..72388be3d 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseFrameMoverTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseFrameMoverTile.java @@ -59,7 +59,9 @@ protected void beginMove() { assert level != null; BlockPos blockInFront = getBlockPos().relative(Direction.values()[getFrontSide()]); if (level.isEmptyBlock(blockInFront)) return; + // If target block already moving, or if we are moving, we cannot start a new move if (MovementManager.getInstance(level).getMovementInfo(blockInFront).isMoving()) return; + if (MovementManager.getInstance(level).getMovementInfo(getBlockPos()).isMoving()) return; assert ProjectRedAPI.expansionAPI != null; Set blocks = ProjectRedAPI.expansionAPI.getStructure(level, blockInFront, getBlockPos()); @@ -144,13 +146,13 @@ public int weakPowerLevel(int side, int mask) { @Override public boolean canGrab(Level w, BlockPos pos, Direction side) { - // If this block is moved, it will come along with whatever structure is on its front face + // If this block is moved, it will bring along whatever structure is touching its front face return side.ordinal() == getFrontSide(); } @Override public boolean canBeGrabbed(Level w, BlockPos pos, Direction side) { - // If a structure on the front face is moved by something else, it may not bring this block along + // If a structure touching front face is moved by something else, it may not bring this block along return side.ordinal() != getFrontSide(); } diff --git a/exploration/build.gradle b/exploration/build.gradle index 8dd43a102..2ff8a0dfd 100644 --- a/exploration/build.gradle +++ b/exploration/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' } String mod_id = 'projectred_exploration' @@ -33,22 +32,3 @@ dependencies { implementation project(":core") } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Exploration - project { - id = '229049' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'project-red-core' - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} \ No newline at end of file diff --git a/exploration/src/main/generated/.cache/09d015dc330d59f8eec0a6dc4d86adf5d6409937 b/exploration/src/main/generated/.cache/09d015dc330d59f8eec0a6dc4d86adf5d6409937 index 970918acf..4f9c8db64 100644 --- a/exploration/src/main/generated/.cache/09d015dc330d59f8eec0a6dc4d86adf5d6409937 +++ b/exploration/src/main/generated/.cache/09d015dc330d59f8eec0a6dc4d86adf5d6409937 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-04T10:59:19.234548 projectred_exploration Block Loot Tables +// 1.20.1 2024-12-24T19:37:49.042697 projectred_exploration Block Loot Tables f377cd52869f1bb40758dc52113c67c61d878b62 data/projectred_exploration/loot_tables/blocks/basalt.json 6b10d48608a3129d5d7885f5430a1f1e15b1a801 data/projectred_exploration/loot_tables/blocks/basalt_brick.json 0208b3852855ab1b7d0729980dcde806b2b17f00 data/projectred_exploration/loot_tables/blocks/basalt_brick_wall.json @@ -9,8 +9,8 @@ f377cd52869f1bb40758dc52113c67c61d878b62 data/projectred_exploration/loot_tables e2ae109c6659c7709c28da431a674eb8c607bc6b data/projectred_exploration/loot_tables/blocks/deepslate_peridot_ore.json ce59282023621005bfe023f7e7649eb55df8df20 data/projectred_exploration/loot_tables/blocks/deepslate_ruby_ore.json 90743dedec7a4cda562b906c4bb361806e25bd50 data/projectred_exploration/loot_tables/blocks/deepslate_sapphire_ore.json -a7a596bb57108e065423cddb5a459c227f4bc9f1 data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json -ba435c351d46b69a1d0e8494f2061817f17f1621 data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json +2c8b823513399fc72f285df091a59dca9efe7d23 data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json +6e2af0d13cd64325734e20b72cb13cc288a5763c data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json 1f80078186126007a55ffa3312150b02f8bcb40b data/projectred_exploration/loot_tables/blocks/electrotine_block.json e3736d3df27fe6b845e109135612ed9856c8a0eb data/projectred_exploration/loot_tables/blocks/electrotine_block_wall.json 08fc1f6cd5af8e816cc6b635407a64f7659978ce data/projectred_exploration/loot_tables/blocks/electrotine_ore.json @@ -30,6 +30,6 @@ c4cb08e8ea7e7e32fb4aa2c4c484920e7a9019f2 data/projectred_exploration/loot_tables 89016b6428da9530bd1ec46b96ab793e87edffe9 data/projectred_exploration/loot_tables/blocks/sapphire_block_wall.json e80459901675826889d9de14de57bc829e62fac5 data/projectred_exploration/loot_tables/blocks/sapphire_ore.json 65989d0c279840b6a7751351c3a5d898802705ae data/projectred_exploration/loot_tables/blocks/silver_block.json -a7a596bb57108e065423cddb5a459c227f4bc9f1 data/projectred_exploration/loot_tables/blocks/silver_ore.json +34854d2e01bede100f7e67cd9507d02475f6d6f8 data/projectred_exploration/loot_tables/blocks/silver_ore.json dcc50b58d079ebca41e9c2661fc58a999653290c data/projectred_exploration/loot_tables/blocks/tin_block.json -ba435c351d46b69a1d0e8494f2061817f17f1621 data/projectred_exploration/loot_tables/blocks/tin_ore.json +9d420b3e2f3226c2a7709487849463eed2f53675 data/projectred_exploration/loot_tables/blocks/tin_ore.json diff --git a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json index bae6cf3a6..40bacd9a9 100644 --- a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json +++ b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json @@ -5,8 +5,32 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "projectred_exploration:raw_silver" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "projectred_exploration:deepslate_silver_ore" + }, + { + "type": "minecraft:item", + "name": "projectred_exploration:raw_silver" + } + ] } ], "rolls": 1.0 diff --git a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json index bf773e297..bd195dc7f 100644 --- a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json +++ b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json @@ -5,8 +5,32 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "projectred_exploration:raw_tin" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "projectred_exploration:deepslate_tin_ore" + }, + { + "type": "minecraft:item", + "name": "projectred_exploration:raw_tin" + } + ] } ], "rolls": 1.0 diff --git a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/silver_ore.json b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/silver_ore.json index bae6cf3a6..b60cc90ed 100644 --- a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/silver_ore.json +++ b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/silver_ore.json @@ -5,8 +5,32 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "projectred_exploration:raw_silver" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "projectred_exploration:silver_ore" + }, + { + "type": "minecraft:item", + "name": "projectred_exploration:raw_silver" + } + ] } ], "rolls": 1.0 diff --git a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/tin_ore.json b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/tin_ore.json index bf773e297..164eb194a 100644 --- a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/tin_ore.json +++ b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/tin_ore.json @@ -5,8 +5,32 @@ "bonus_rolls": 0.0, "entries": [ { - "type": "minecraft:item", - "name": "projectred_exploration:raw_tin" + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "projectred_exploration:tin_ore" + }, + { + "type": "minecraft:item", + "name": "projectred_exploration:raw_tin" + } + ] } ], "rolls": 1.0 diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java index 6607e9d46..cc3e21e0c 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java @@ -27,10 +27,10 @@ protected void registerTables() { register(DEEPSLATE_PERIDOT_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_PERIDOT_ORE_BLOCK.get(), PERIDOT_ITEM.get(), 1, 2)); register(ELECTROTINE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(ELECTROTINE_ORE_BLOCK.get(), ELECTROTINE_DUST_ITEM.get(), 1, 8)); register(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), ELECTROTINE_DUST_ITEM.get(), 1, 8)); - register(TIN_ORE_BLOCK.get(), singleItem(RAW_TIN_ITEM.get())); - register(DEEPSLATE_TIN_ORE_BLOCK.get(), singleItem(RAW_TIN_ITEM.get())); - register(SILVER_ORE_BLOCK.get(), singleItem(RAW_SILVER_ITEM.get())); - register(DEEPSLATE_SILVER_ORE_BLOCK.get(), singleItem(RAW_SILVER_ITEM.get())); + register(TIN_ORE_BLOCK.get(), singleItemOrSilk(TIN_ORE_BLOCK.get(), RAW_TIN_ITEM.get())); + register(DEEPSLATE_TIN_ORE_BLOCK.get(), singleItemOrSilk(DEEPSLATE_TIN_ORE_BLOCK.get(), RAW_TIN_ITEM.get())); + register(SILVER_ORE_BLOCK.get(), singleItemOrSilk(SILVER_ORE_BLOCK.get(), RAW_SILVER_ITEM.get())); + register(DEEPSLATE_SILVER_ORE_BLOCK.get(), singleItemOrSilk(DEEPSLATE_SILVER_ORE_BLOCK.get(), RAW_SILVER_ITEM.get())); // Decorative Blocks register(MARBLE_BLOCK.get(), singleItem(MARBLE_BLOCK.get())); diff --git a/fabrication/build.gradle b/fabrication/build.gradle index a68797851..b53e100ee 100644 --- a/fabrication/build.gradle +++ b/fabrication/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' id 'com.github.johnrengelman.shadow' } @@ -58,24 +57,3 @@ reobf { jar { enabled = false } // Disable unshaded jar shadowJar { } // Enable shadow jar reobf } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Fabrication - project { - id = '230111' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'project-red-core' - requiredDependency 'project-red-integration' - requiredDependency 'project-red-transmission' - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} diff --git a/fabrication/src/main/generated/.cache/4cbdb80d40a3d0a708ad9fd5e4bf268842bd5f55 b/fabrication/src/main/generated/.cache/4cbdb80d40a3d0a708ad9fd5e4bf268842bd5f55 index c618daae9..1398c7a4e 100644 --- a/fabrication/src/main/generated/.cache/4cbdb80d40a3d0a708ad9fd5e4bf268842bd5f55 +++ b/fabrication/src/main/generated/.cache/4cbdb80d40a3d0a708ad9fd5e4bf268842bd5f55 @@ -1,7 +1,7 @@ -// 1.20.1 2024-05-02T16:38:46.517119 projectred_fabrication Item models. +// 1.20.1 2024-11-20T10:19:10.612339 projectred_fabrication Item models. 1ed00fc3905c39043afd5719cad608e5f9083e9b assets/projectred_fabrication/models/item/blank_photomask.json ad27f25b0b09f179175e551b1f53b0d5b44ede55 assets/projectred_fabrication/models/item/etched_silicon_wafer.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_fabrication/models/item/fabricated_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_fabrication/models/item/fabricated_gate.json 4cbf55f2a0a67b14bd3a287a664bce6020f5ddcf assets/projectred_fabrication/models/item/ic_blueprint.json e5461019a64c6770cc104f21fecd3bbea6dd167d assets/projectred_fabrication/models/item/ic_workbench.json ea3630e414ed66ce7e05657e56165c1a2b391648 assets/projectred_fabrication/models/item/invalid_die.json diff --git a/fabrication/src/main/generated/assets/projectred_fabrication/models/item/fabricated_gate.json b/fabrication/src/main/generated/assets/projectred_fabrication/models/item/fabricated_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/fabrication/src/main/generated/assets/projectred_fabrication/models/item/fabricated_gate.json +++ b/fabrication/src/main/generated/assets/projectred_fabrication/models/item/fabricated_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java index 8d9a7408f..f3ff9057d 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java @@ -1,6 +1,7 @@ package mrtjp.projectred.fabrication.data; import codechicken.lib.datagen.ItemModelProvider; +import mrtjp.projectred.integration.client.GatePartItemRenderer; import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.ExistingFileHelper; @@ -32,6 +33,6 @@ protected void registerModels() { generated(VALID_DIE_ITEM); generated(INVALID_DIE_ITEM); - generated(FABRICATED_GATE_ITEM).noTexture(); // Dummy model to suppress warnings (actually rendered runtime via IItemRenderer) + clazz(FABRICATED_GATE_ITEM, GatePartItemRenderer.class); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java index 383aac553..527a14eb2 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java @@ -1,19 +1,15 @@ package mrtjp.projectred.fabrication.init; -import codechicken.lib.model.ModelRegistryHelper; import codechicken.multipart.api.MultipartClientRegistry; import mrtjp.projectred.fabrication.gui.ICRenderTypes; import mrtjp.projectred.fabrication.gui.screen.inventory.LithographyTableScreen; import mrtjp.projectred.fabrication.gui.screen.inventory.PackagingTableScreen; import mrtjp.projectred.fabrication.gui.screen.inventory.PlottingTableScreen; -import mrtjp.projectred.integration.client.GatePartItemRenderer; import mrtjp.projectred.integration.client.GatePartRenderer; import net.minecraft.client.gui.screens.MenuScreens; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.ForgeRegistries; import static mrtjp.projectred.fabrication.init.FabricationMenus.*; @@ -34,10 +30,6 @@ private static void clientSetup(final FMLClientSetupEvent event) { // Register part renderers MultipartClientRegistry.register(FabricationParts.FABRICATED_GATE_PART.get(), GatePartRenderer.INSTANCE); - // Register models - ModelRegistryHelper modelRegistryHelper = new ModelRegistryHelper(); - modelRegistryHelper.register(new ModelResourceLocation(ForgeRegistries.ITEMS.getKey(FabricationParts.FABRICATED_GATE_ITEM.get()), "inventory"), GatePartItemRenderer.INSTANCE); - // Register screens MenuScreens.register(PLOTTING_TABLE_CONTAINER.get(), PlottingTableScreen::new); MenuScreens.register(LITHOGRAPHY_TABLE_CONTAINER.get(), LithographyTableScreen::new); diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java index 56dc816fe..6503ed5fc 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java @@ -36,22 +36,26 @@ public void appendHoverText(ItemStack stack, @Nullable Level p_77624_2_, List false; }; } - - @Override - public void setChanged() { - super.setChanged(); - cancelWorkIfNeeded(); - } }; public LithographyTableTile(BlockPos pos, BlockState state) { super(FabricationBlocks.LITHOGRAPHY_TABLE_TILE.get(), pos, state); - inventory.addListener(c -> setChanged()); + inventory.addListener(this::onInventoryChanged); } public Container getInventory() { @@ -63,7 +51,7 @@ public Container getInventory() { @Override public void saveToNBT(CompoundTag tag) { super.saveToNBT(tag); - tag.put("inventory", inventory.createTag()); + inventory.saveTo(tag, "inventory");; } @Override @@ -97,10 +85,9 @@ public void onBlockRemoved() { dropInventory(inventory, getLevel(), Vector3.fromBlockPos(getBlockPos())); } - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - return super.getCapability(cap, side); //TODO add capabilities + private void onInventoryChanged(Container inventory) { + cancelWorkIfNeeded(); + setChanged(); } @Override diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java index fc0760724..bfb5f9783 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java @@ -13,9 +13,7 @@ import mrtjp.projectred.fabrication.inventory.container.PackagingTableContainer; import mrtjp.projectred.fabrication.item.ValidDieItem; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; import net.minecraft.world.InteractionHand; @@ -25,13 +23,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; import org.jetbrains.annotations.NotNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import static mrtjp.projectred.fabrication.editor.EditorDataUtils.getInterfaceSpec; import static mrtjp.projectred.fabrication.editor.EditorDataUtils.hasFabricationTarget; @@ -50,19 +43,13 @@ public boolean canPlaceItem(int slot, @NotNull ItemStack stack) { default -> true; }; } - - @Override - public void setChanged() { - super.setChanged(); - cancelWorkIfNeeded(); - } }; private int problematicSlotMask = 0; // Masks of slots that client should render red highlights public PackagingTableTile(BlockPos pos, BlockState state) { super(FabricationBlocks.PACKAGING_TABLE_TILE.get(), pos, state); - inventory.addListener(c -> setChanged()); + inventory.addListener(this::onInventoryChanged); } public Container getInventory() { @@ -72,7 +59,7 @@ public Container getInventory() { @Override public void saveToNBT(CompoundTag tag) { super.saveToNBT(tag); - tag.put("inventory", inventory.createTag()); + inventory.saveTo(tag, "inventory"); } @Override @@ -106,10 +93,9 @@ public void onBlockRemoved() { dropInventory(inventory, getLevel(), Vector3.fromBlockPos(getBlockPos())); } - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - return super.getCapability(cap, side); //TODO add capabilities + private void onInventoryChanged(Container inventory) { + cancelWorkIfNeeded(); + setChanged(); } @Override diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java index eb716e730..2a064b30c 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java @@ -11,7 +11,6 @@ import mrtjp.projectred.fabrication.item.BlankPhotomaskItem; import mrtjp.projectred.fabrication.item.ICBlueprintItem; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.Container; @@ -22,11 +21,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; public class PlottingTableTile extends FabricationMachineTile { @@ -40,17 +34,11 @@ public boolean canPlaceItem(int slot, ItemStack stack) { default -> false; }; } - - @Override - public void setChanged() { - super.setChanged(); - cancelWorkIfNeeded(); - } }; public PlottingTableTile(BlockPos pos, BlockState state) { super(FabricationBlocks.PLOTTING_TABLE_TILE.get(), pos, state); - inventory.addListener(c -> setChanged()); + inventory.addListener(this::onInventoryChanged); } public Container getInventory() { @@ -60,7 +48,7 @@ public Container getInventory() { @Override public void saveToNBT(CompoundTag tag) { super.saveToNBT(tag); - tag.put("inventory", inventory.createTag()); + inventory.saveTo(tag, "inventory"); } @Override @@ -94,10 +82,9 @@ public void onBlockRemoved() { dropInventory(inventory, getLevel(), Vector3.fromBlockPos(getBlockPos())); } - @Nonnull - @Override - public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - return super.getCapability(cap, side); //TODO add capabilities + private void onInventoryChanged(Container inventory) { + cancelWorkIfNeeded(); + setChanged(); } @Override diff --git a/illumination/build.gradle b/illumination/build.gradle index d91412ae5..ac1cc6d87 100644 --- a/illumination/build.gradle +++ b/illumination/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' } String mod_id = 'projectred_illumination' @@ -33,22 +32,3 @@ dependencies { implementation project(":core") } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Illumination - project { - id = '229046' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'project-red-core' - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} \ No newline at end of file diff --git a/illumination/src/main/generated/.cache/0bff00c43f6afffc865d20256c78224a8f143cd8 b/illumination/src/main/generated/.cache/0bff00c43f6afffc865d20256c78224a8f143cd8 index 547ef96ad..7d090ed92 100644 --- a/illumination/src/main/generated/.cache/0bff00c43f6afffc865d20256c78224a8f143cd8 +++ b/illumination/src/main/generated/.cache/0bff00c43f6afffc865d20256c78224a8f143cd8 @@ -1,162 +1,162 @@ -// 1.20.1 2024-06-22T11:09:50.160072 projectred_illumination Item models. -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_fixture_light.json +// 1.20.1 2024-11-20T10:11:58.441674 projectred_illumination Item models. +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_fixture_light.json 4b690e570f24ca71d1415f677131d7a642f097be assets/projectred_illumination/models/item/black_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_inverted_fixture_light.json 204e063faf364cddec0c0710633e45793f5be38b assets/projectred_illumination/models/item/black_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/black_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/black_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_fixture_light.json 103cdf46afdaabb21052a67412a116b041f3c5c7 assets/projectred_illumination/models/item/blue_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_inverted_fixture_light.json dd471bea3ea7896c17f7647cc91650bbe2297b89 assets/projectred_illumination/models/item/blue_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/blue_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/blue_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_fixture_light.json 8c9bbb2545d42add1e7906828a913173779fd5ca assets/projectred_illumination/models/item/brown_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_inverted_fixture_light.json ff98c4e4c44904c78069165aea5a8ebcc8e40a21 assets/projectred_illumination/models/item/brown_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/brown_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/brown_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_fixture_light.json 9154784e685678898594d58d200e04e2dfba132f assets/projectred_illumination/models/item/cyan_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json de5d504d1f1f363dbc4033e903f38ab0302ff4c8 assets/projectred_illumination/models/item/cyan_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/cyan_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/cyan_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_fixture_light.json 4de79fb5fb1dc31d437059846878f924cc95f423 assets/projectred_illumination/models/item/gray_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_inverted_fixture_light.json 9468b3a38c1077cab77482efc0c6fa169ad1bcdd assets/projectred_illumination/models/item/gray_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/gray_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/gray_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_fixture_light.json ecf02abd63a27c5ad850cd0643020cdbd800141b assets/projectred_illumination/models/item/green_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_inverted_fixture_light.json 3b57b1bd43ea0d8e0b5691177b1431a5c5b8e6fa assets/projectred_illumination/models/item/green_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/green_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/green_lantern.json f08f45f7fd93ac70ed2e01d17acf536a88abe652 assets/projectred_illumination/models/item/illumar_smart_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_fixture_light.json 1fcb1a3defac879f5f1a9bc037b1a614eed36cb2 assets/projectred_illumination/models/item/light_blue_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json 1b71c5c3ad849a28dd5adcdcf3f8be8d5177fc1f assets/projectred_illumination/models/item/light_blue_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_blue_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_blue_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_fixture_light.json e5dab33ac6e605976080108bbab0bec99c2da2cf assets/projectred_illumination/models/item/light_gray_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json 02b9034e83b29d6cdb16953f9bf23ea186ede9a7 assets/projectred_illumination/models/item/light_gray_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/light_gray_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/light_gray_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_fixture_light.json 69586ea3183c7ead81c0848a69767b713885ad2d assets/projectred_illumination/models/item/lime_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_inverted_fixture_light.json c69622682bee86bf4d4151ce75845b376eae7cd1 assets/projectred_illumination/models/item/lime_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/lime_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/lime_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_fixture_light.json 82796440b23963605326b3042ae6cfa2d40bb3bb assets/projectred_illumination/models/item/magenta_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json bf8abe464f4beb4712eb9343e69c019118c5e773 assets/projectred_illumination/models/item/magenta_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/magenta_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/magenta_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_fixture_light.json d32a27ae3d54813d91171da43f08b733f41753e7 assets/projectred_illumination/models/item/orange_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_inverted_fixture_light.json a0f0e18ab612e3de42974398e8dca42b479e3209 assets/projectred_illumination/models/item/orange_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/orange_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/orange_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_fixture_light.json 67e73ec14616ead0e5eb4364f320eb1c91774e40 assets/projectred_illumination/models/item/pink_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_inverted_fixture_light.json 14fa3ee95eabe71bf28de3534a5b6051183dc64c assets/projectred_illumination/models/item/pink_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/pink_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/pink_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_fixture_light.json 35e2cbd7482eeaceed068488d612689e61520c7a assets/projectred_illumination/models/item/purple_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_inverted_fixture_light.json 8b929e965609fce3cd4ed1c86b2d211c31692c2f assets/projectred_illumination/models/item/purple_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/purple_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/purple_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_fixture_light.json 3884d7433e0b3318e5873decf5be6e3a790f2fbf assets/projectred_illumination/models/item/red_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_inverted_fixture_light.json edc3ffa1251d7face03e863289915d987cbf9fc4 assets/projectred_illumination/models/item/red_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/red_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/red_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_fixture_light.json 46251e05bb55c75f3c56f2c3f7252df2d07b3c8b assets/projectred_illumination/models/item/white_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_inverted_fixture_light.json 6fdee3bf99c266fa22afdf8a615e685671bbada2 assets/projectred_illumination/models/item/white_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/white_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/white_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_fixture_light.json 9ffde1232343e4d1f21b558df29fb6b967b7d1bb assets/projectred_illumination/models/item/yellow_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_inverted_cage_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_inverted_cage_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json 15f8c1b910031cc36b15eeb8780e330c08189588 assets/projectred_illumination/models/item/yellow_inverted_illumar_lamp.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_inverted_lantern.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_illumination/models/item/yellow_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_inverted_lantern.json +27f0a118dfb8a9917320c0c49f20fbf73c25d3da assets/projectred_illumination/models/item/yellow_lantern.json diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json index 1bcbb312f..75edf6ff4 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.illumination.MultipartLightProperties$DefaultMultipartLightItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java b/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java index 47b35d3de..b7e85f8ca 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java @@ -102,32 +102,8 @@ public ColourMultiplier getColourMultiplier(int color, boolean isOn) { } @OnlyIn(Dist.CLIENT) - public IItemRenderer getItemRenderer() { - return new IItemRenderer() { - @Override - public void renderItem(ItemStack stack, ItemDisplayContext transformType, PoseStack mStack, MultiBufferSource getter, int packedLight, int packedOverlay) { - if (!(stack.getItem() instanceof MultipartLightPartItem lightItem)) return; - - CCRenderState ccrs = CCRenderState.instance(); - ccrs.reset(); - ccrs.brightness = packedLight; - ccrs.overlay = packedOverlay; - ccrs.bind(RenderType.cutout(), getter, mStack); - renderInventory(lightItem.getColor(), lightItem.isInverted(), Vector3.ZERO, ccrs); - - if (lightItem.isInverted()) { - HaloRenderer.renderInventoryHalo(ccrs, mStack, getter, getInventoryGlowBounds(), Vector3.ZERO, lightItem.getColor()); - HaloRenderer.addItemRendererBloom(transformType, mStack, Vector3.ZERO, getInventoryGlowBounds(), lightItem.getColor()); - } - } - - //@formatter:off - @Override public PerspectiveModelState getModelState() { return TransformUtils.DEFAULT_BLOCK; } - @Override public boolean useAmbientOcclusion() { return false; } - @Override public boolean isGui3d() { return true; } - @Override public boolean usesBlockLight() { return true; } - //@formatter:on - }; + public Class getItemRendererClass() { + return DefaultMultipartLightItemRenderer.class; } //endregion @@ -175,4 +151,37 @@ public static Cuboid6[] sidedBoxes(Cuboid6 box) { return boxes; } //endregion + + @OnlyIn(Dist.CLIENT) + public static final class DefaultMultipartLightItemRenderer implements IItemRenderer { + + public DefaultMultipartLightItemRenderer() { + } + + @Override + public void renderItem(ItemStack stack, ItemDisplayContext transformType, PoseStack mStack, MultiBufferSource getter, int packedLight, int packedOverlay) { + if (!(stack.getItem() instanceof MultipartLightPartItem lightItem)) return; + + var props = lightItem.getLightProperties(); + + CCRenderState ccrs = CCRenderState.instance(); + ccrs.reset(); + ccrs.brightness = packedLight; + ccrs.overlay = packedOverlay; + ccrs.bind(RenderType.cutout(), getter, mStack); + props.renderInventory(lightItem.getColor(), lightItem.isInverted(), Vector3.ZERO, ccrs); + + if (lightItem.isInverted()) { + HaloRenderer.renderInventoryHalo(ccrs, mStack, getter, props.getInventoryGlowBounds(), Vector3.ZERO, lightItem.getColor()); + HaloRenderer.addItemRendererBloom(transformType, mStack, Vector3.ZERO, props.getInventoryGlowBounds(), lightItem.getColor()); + } + } + + //@formatter:off + @Override public PerspectiveModelState getModelState() { return TransformUtils.DEFAULT_BLOCK; } + @Override public boolean useAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean usesBlockLight() { return true; } + //@formatter:on + } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java b/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java index 913c1fdf6..90c7c5152 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java @@ -33,8 +33,8 @@ protected void registerModels() { for (MultipartLightType type : MultipartLightType.values()) { for (int color = 0; color < 16; color++) { - generated(type.getItem(color, false)).noTexture(); - generated(type.getItem(color, true)).noTexture(); + clazz(type.getItem(color, false), type.getProperties().getItemRendererClass()); + clazz(type.getItem(color, true), type.getProperties().getItemRendererClass()); } } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java index 834c367e0..cbed9e535 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java @@ -1,6 +1,5 @@ package mrtjp.projectred.illumination.init; -import codechicken.lib.model.ModelRegistryHelper; import codechicken.multipart.api.MultipartClientRegistry; import mrtjp.projectred.illumination.BlockLightType; import mrtjp.projectred.illumination.MultipartLightType; @@ -20,8 +19,6 @@ public class IlluminationClientInit { - private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); - public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -49,17 +46,8 @@ private static void clientSetup(final FMLClientSetupEvent event) { // Register light part renderers for (MultipartLightType type : MultipartLightType.values()) { for (int colour = 0; colour < 16; colour++) { - // Block renderers MultipartClientRegistry.register(type.getPartType(colour, false), MultipartLightPartRenderer.INSTANCE); MultipartClientRegistry.register(type.getPartType(colour, true), MultipartLightPartRenderer.INSTANCE); - - // Item renderers - MODEL_HELPER.register( - new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject(colour, false).getId()), "inventory"), - type.getProperties().getItemRenderer()); - MODEL_HELPER.register( - new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject(colour, true).getId()), "inventory"), - type.getProperties().getItemRenderer()); } } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/item/MultipartLightPartItem.java b/illumination/src/main/java/mrtjp/projectred/illumination/item/MultipartLightPartItem.java index 24e349ae9..a0a9b9929 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/item/MultipartLightPartItem.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/item/MultipartLightPartItem.java @@ -22,6 +22,10 @@ public MultipartLightPartItem(MultipartLightProperties lightProperties, int colo this.inverted = inverted; } + public MultipartLightProperties getLightProperties() { + return properties; + } + public int getColor() { return color; } diff --git a/integration/build.gradle b/integration/build.gradle index 4510719c0..0b2df6dc8 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' } String mod_id = 'projectred_integration' @@ -33,22 +32,3 @@ dependencies { implementation project(":core") } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Integration - project { - id = '229045' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'project-red-core' - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} diff --git a/integration/src/main/generated/.cache/8a6f9a0278662d141141aabe64bfbd22f6606579 b/integration/src/main/generated/.cache/8a6f9a0278662d141141aabe64bfbd22f6606579 index 285bb32bf..d20a7f219 100644 --- a/integration/src/main/generated/.cache/8a6f9a0278662d141141aabe64bfbd22f6606579 +++ b/integration/src/main/generated/.cache/8a6f9a0278662d141141aabe64bfbd22f6606579 @@ -1,35 +1,35 @@ -// 1.20.1 2024-05-02T16:39:53.48876 projectred_integration Item models. -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/and_cell_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/and_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/buffer_cell_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/buffer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/bus_converter_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/bus_input_panel_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/bus_randomizer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/bus_transceiver_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/comparator_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/counter_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/dec_randomizer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/invert_cell_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/light_sensor_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/multiplexer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/nand_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/nor_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/not_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/null_cell_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/or_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/pulse_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/rain_sensor_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/randomizer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/repeater_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/segment_display_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/sequencer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/sr_latch_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/stacking_latch_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/state_cell_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/synchronizer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/timer_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/toggle_latch_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/transparent_latch_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/xnor_gate.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_integration/models/item/xor_gate.json +// 1.20.1 2024-11-20T10:19:40.10346 projectred_integration Item models. +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/and_cell_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/and_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/buffer_cell_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/buffer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/bus_converter_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/bus_input_panel_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/bus_randomizer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/bus_transceiver_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/comparator_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/counter_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/dec_randomizer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/invert_cell_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/light_sensor_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/multiplexer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/nand_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/nor_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/not_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/null_cell_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/or_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/pulse_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/rain_sensor_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/randomizer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/repeater_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/segment_display_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/sequencer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/sr_latch_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/stacking_latch_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/state_cell_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/synchronizer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/timer_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/toggle_latch_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/transparent_latch_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/xnor_gate.json +1ad624e432abba49e3dca47630174141d067ebb1 assets/projectred_integration/models/item/xor_gate.json diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json index 1bcbb312f..9cfb85d1d 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.integration.client.GatePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java b/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java index a576f5e3d..367789b08 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java +++ b/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java @@ -15,7 +15,8 @@ public class GatePartItemRenderer implements IItemRenderer { - public static final GatePartItemRenderer INSTANCE = new GatePartItemRenderer(); + public GatePartItemRenderer() { + } @Override public boolean useAmbientOcclusion() { diff --git a/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java b/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java index 7bfbce4a8..b01ec61f1 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java +++ b/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java @@ -2,6 +2,7 @@ import codechicken.lib.datagen.ItemModelProvider; import mrtjp.projectred.integration.GateType; +import mrtjp.projectred.integration.client.GatePartItemRenderer; import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.ExistingFileHelper; @@ -18,7 +19,7 @@ protected void registerModels() { for (GateType type : GateType.values()) { if (type.isExternalGate()) continue; - generated(type.getItem()).noTexture(); + clazz(type.getItem(), GatePartItemRenderer.class); } } } diff --git a/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java b/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java index 7bc97f8b6..5abf0d244 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java +++ b/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java @@ -1,23 +1,16 @@ package mrtjp.projectred.integration.init; -import codechicken.lib.model.ModelRegistryHelper; import codechicken.lib.util.ResourceUtils; import codechicken.multipart.api.MultipartClientRegistry; import mrtjp.projectred.integration.GateType; import mrtjp.projectred.integration.client.GateModelRenderer; -import mrtjp.projectred.integration.client.GatePartItemRenderer; import mrtjp.projectred.integration.client.GatePartRenderer; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import java.util.Objects; - public class IntegrationClientInit { - private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); - public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -32,11 +25,8 @@ private static void clientSetup(final FMLClientSetupEvent event) { for (GateType type : GateType.values()) { if (type.isExternalGate()) continue; - // Register part block renderers + // Register part part renderers MultipartClientRegistry.register(type.getPartType(), GatePartRenderer.INSTANCE); - - // Register part item renderer - MODEL_HELPER.register(new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject().getId()), "inventory"), GatePartItemRenderer.INSTANCE); } ResourceUtils.registerReloadListener(GateModelRenderer::onResourceManagerReload); diff --git a/settings.gradle b/settings.gradle index 11d53add0..b02693b7a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,7 +9,6 @@ pluginManagement { id 'java' id 'maven-publish' id 'net.covers1624.signing' version '1.1.3' apply false - id 'com.matthewprenger.cursegradle' version '1.4.0' apply false id 'net.neoforged.gradle' version '[6.0.18,6.2)' apply false id 'org.spongepowered.mixin' version '0.7.+' apply false id 'com.github.johnrengelman.shadow' version '7.1.+' apply false diff --git a/transmission/build.gradle b/transmission/build.gradle index cbd9a4452..19c6f9588 100644 --- a/transmission/build.gradle +++ b/transmission/build.gradle @@ -1,6 +1,5 @@ plugins { id 'net.neoforged.gradle' - id 'com.matthewprenger.cursegradle' } String mod_id = 'projectred_transmission' @@ -33,22 +32,3 @@ dependencies { implementation project(":core") } - -curseforge { - apiKey = System.getenv('CURSE_TOKEN') ?: 'XXX' - - // Transmission - project { - id = '478939' - releaseType = System.getenv('CURSE_RELEASE_TYPE') ?: 'alpha' - changelogType = 'markdown' - changelog = rootProject.file('CHANGELOG.md') - relations { - requiredDependency 'project-red-core' - } - - // Java/ForgeGradle integrations don't work after 1.18.2 port - addGameVersion "${mc_version}" - addGameVersion "Java ${java_lang_version}" - } -} \ No newline at end of file diff --git a/transmission/src/main/generated/.cache/559edefec34c0193b89f0dfbc70e66bb4fcf6966 b/transmission/src/main/generated/.cache/559edefec34c0193b89f0dfbc70e66bb4fcf6966 index e3dec1e07..f14e7131b 100644 --- a/transmission/src/main/generated/.cache/559edefec34c0193b89f0dfbc70e66bb4fcf6966 +++ b/transmission/src/main/generated/.cache/559edefec34c0193b89f0dfbc70e66bb4fcf6966 @@ -1,71 +1,71 @@ -// 1.20.1 2024-05-02T16:40:18.847339 projectred_transmission Item models. -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/black_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/black_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/black_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/black_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/blue_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/blue_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/blue_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/blue_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/brown_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/brown_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/brown_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/brown_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/cyan_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/cyan_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/framed_red_alloy_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/gray_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/gray_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/gray_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/gray_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/green_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/green_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/green_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/green_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_blue_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_blue_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_gray_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/light_gray_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/lime_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/lime_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/lime_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/lime_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/low_load_framed_power_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/low_load_power_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/magenta_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/magenta_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/neutral_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/orange_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/orange_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/orange_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/orange_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/pink_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/pink_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/pink_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/pink_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/purple_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/purple_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/purple_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/purple_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/red_alloy_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/red_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/red_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/red_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/red_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/white_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/white_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/white_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/white_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/yellow_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json -a163c9ce1e63e428f3fa804b66e491b455f18540 assets/projectred_transmission/models/item/yellow_insulated_wire.json +// 1.20.1 2024-11-20T10:21:16.083699 projectred_transmission Item models. +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/black_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/black_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/black_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/black_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/blue_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/blue_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/blue_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/blue_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/brown_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/brown_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/brown_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/brown_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/cyan_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/cyan_insulated_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/framed_red_alloy_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/gray_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/gray_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/gray_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/gray_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/green_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/green_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/green_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/green_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/light_blue_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/light_blue_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/light_gray_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/light_gray_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/lime_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/lime_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/lime_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/lime_insulated_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/low_load_framed_power_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/low_load_power_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/magenta_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/magenta_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/neutral_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/orange_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/orange_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/orange_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/orange_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/pink_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/pink_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/pink_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/pink_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/purple_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/purple_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/purple_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/purple_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/red_alloy_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/red_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/red_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/red_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/red_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/white_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/white_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/white_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/white_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/yellow_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json +4385b001def81250e68d139a250f3d626f6ece3d assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json +ae799f62ebd5a24fc3cc6fa00d2d7ece5df14680 assets/projectred_transmission/models/item/yellow_insulated_wire.json diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json index 1bcbb312f..0472f3284 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.FramedWirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json index 1bcbb312f..ab98653e2 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json @@ -1,3 +1,5 @@ { - "parent": "minecraft:item/generated" + "parent": "minecraft:item/generated", + "class": "mrtjp.projectred.transmission.client.WirePartItemRenderer", + "loader": "codechickenlib:class" } \ No newline at end of file diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWirePartItemRenderer.java b/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWirePartItemRenderer.java index 0c0f3728f..dfb1fd338 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWirePartItemRenderer.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWirePartItemRenderer.java @@ -15,9 +15,7 @@ public class FramedWirePartItemRenderer implements IItemRenderer { - public static final FramedWirePartItemRenderer INSTANCE = new FramedWirePartItemRenderer(); - - private FramedWirePartItemRenderer() { } + public FramedWirePartItemRenderer() { } @Override public boolean useAmbientOcclusion() { diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/client/WirePartItemRenderer.java b/transmission/src/main/java/mrtjp/projectred/transmission/client/WirePartItemRenderer.java index c4e59fb1a..394cc31da 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/client/WirePartItemRenderer.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/client/WirePartItemRenderer.java @@ -15,9 +15,7 @@ public class WirePartItemRenderer implements IItemRenderer { - public static final WirePartItemRenderer INSTANCE = new WirePartItemRenderer(); - - private WirePartItemRenderer() { } + public WirePartItemRenderer() { } @Override public boolean useAmbientOcclusion() { diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java b/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java index 8870bece6..bb1bbbe29 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java @@ -2,6 +2,8 @@ import codechicken.lib.datagen.ItemModelProvider; import mrtjp.projectred.transmission.WireType; +import mrtjp.projectred.transmission.client.FramedWirePartItemRenderer; +import mrtjp.projectred.transmission.client.WirePartItemRenderer; import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.ExistingFileHelper; @@ -19,6 +21,7 @@ protected void registerModels() { // Wires and framed wires for (WireType type : WireType.values()) { generated(type.getItem()).noTexture(); + clazz(type.getItem(), type.isCenterPart() ? FramedWirePartItemRenderer.class : WirePartItemRenderer.class); } } } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java b/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java index b8b5cb8f1..0a977e61e 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java @@ -1,22 +1,18 @@ package mrtjp.projectred.transmission.init; -import codechicken.lib.model.ModelRegistryHelper; import codechicken.microblock.client.MicroMaterialClientRegistry; import codechicken.multipart.api.MultipartClientRegistry; import mrtjp.projectred.transmission.WireType; -import mrtjp.projectred.transmission.client.*; +import mrtjp.projectred.transmission.client.CenterWirePartRenderer; +import mrtjp.projectred.transmission.client.FaceWirePartRenderer; +import mrtjp.projectred.transmission.client.FramedWireHighlightRenderer; import net.covers1624.quack.util.SneakyUtils; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import java.util.Objects; - public class TransmissionClientInit { - private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); - public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); @@ -30,15 +26,10 @@ public static void init() { private static void clientSetup(final FMLClientSetupEvent event) { - // Wire renderer registration + // Wire part renderer registration for (WireType type : WireType.values()) { - // Block renderer MultipartClientRegistry.register(type.getPartType(), SneakyUtils.unsafeCast(type.isCenterPart() ? CenterWirePartRenderer.INSTANCE : FaceWirePartRenderer.INSTANCE)); - - // Item renderer - MODEL_HELPER.register(new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject().getId()), "inventory"), - type.isCenterPart() ? FramedWirePartItemRenderer.INSTANCE : WirePartItemRenderer.INSTANCE); } // Highlight renderer for cover-on-wire overlay diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedPowerWire.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedPowerWire.java index bb9e2f93b..4b30f5c74 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedPowerWire.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedPowerWire.java @@ -67,6 +67,7 @@ private void recacheConductors() { //region Connections @Override public void maskChangeEvent(boolean internalChange, boolean externalChange) { + super.maskChangeEvent(internalChange, externalChange); // Invalidate even if conns have not changed (adjacent conductors may have moved, etc) cacheInvalid = true; }