From a24cfc824e7eabf83e3b26b7f500ef2450fe58af Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Wed, 19 Jun 2024 08:28:04 +0200 Subject: [PATCH] feat: update to 1.21 Broken: * `ModPaintings`: no paintings in the game appear if the mod is installed even having the painting completely disabled, I have reverted my 1.21 port for them, and commented out the current code. * `TotemOfPrideParticle`: doesn't work --- build.gradle | 6 +- gradle.properties | 12 +- .../java/gay/pridecraft/joymod/JoyMod.java | 10 +- .../gay/pridecraft/joymod/JoyModClient.java | 4 +- .../pridecraft/joymod/block/ModBlocks.java | 111 ++++++++---------- .../joymod/datagen/ModLootTableProvider.java | 7 +- .../joymod/datagen/ModRecipeProvider.java | 7 +- .../pridecraft/joymod/entity/ModEntities.java | 73 ++++++------ .../pridecraft/joymod/item/ModItemGroups.java | 2 +- .../gay/pridecraft/joymod/item/ModItems.java | 23 ++-- .../joymod/painting/ModPaintings.java | 4 +- .../joymod/particle/ModParticles.java | 6 +- .../joymod/particle/TotemOfPrideParticle.java | 7 +- .../renderer/entity/PrideAxolotlRenderer.java | 10 +- .../renderer/entity/PrideBiiRenderer.java | 8 +- .../renderer/entity/PrideFrogRenderer.java | 17 ++- .../renderer/entity/PrideSlimeRenderer.java | 2 +- .../renderer/entity/PrideSnifferRenderer.java | 2 +- .../renderer/entity/ThighHighFoxRenderer.java | 14 +-- .../feature/CustomElytraFeatureRenderer.java | 6 +- .../PrideSlimeOverlayFeatureRenderer.java | 2 +- .../joymod/util/BedTextureProvider.java | 4 +- 22 files changed, 170 insertions(+), 167 deletions(-) diff --git a/build.gradle b/build.gradle index 911231a..a127a2b 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -59,8 +59,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { diff --git a/gradle.properties b/gradle.properties index ee555d2..98c3a79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.10 +minecraft_version=1.21 +yarn_mappings=1.21+build.2 +loader_version=0.15.11 -mod_version = 1.0.0-1.20.4 +mod_version = 1.0.0+mc1.21 maven_group = gay.pridecraft archives_base_name = joymod -fabric_version=0.92.1+1.20.4 -midnightlib_version=1.5.3-fabric +fabric_version=0.100.1+1.21 +midnightlib_version=1.5.7-fabric badges_lib=2023.6.1 diff --git a/src/main/java/gay/pridecraft/joymod/JoyMod.java b/src/main/java/gay/pridecraft/joymod/JoyMod.java index fe59285..09f9f18 100644 --- a/src/main/java/gay/pridecraft/joymod/JoyMod.java +++ b/src/main/java/gay/pridecraft/joymod/JoyMod.java @@ -7,7 +7,6 @@ import gay.pridecraft.joymod.entity.ModEntities; import gay.pridecraft.joymod.entity.spawn.SpawnModifier; import gay.pridecraft.joymod.item.ModItemGroups; import gay.pridecraft.joymod.item.ModItems; -import gay.pridecraft.joymod.painting.ModPaintings; import gay.pridecraft.joymod.particle.ModParticles; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -16,8 +15,7 @@ import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.sound.SoundInstance; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.mob.MobEntity; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; +import net.minecraft.registry.*; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import org.slf4j.Logger; @@ -28,7 +26,7 @@ import java.util.Random; public class JoyMod implements ModInitializer { public static final String MOD_ID = "joymod"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); - public static final Identifier MUSIC_GAME = new Identifier(MOD_ID, "music.ambient"); + public static final Identifier MUSIC_GAME = Identifier.of(MOD_ID, "music.ambient"); public static SoundEvent MUSIC_GAME_EVENT = SoundEvent.of(MUSIC_GAME); private int tickCounter = 0; private final Random random = new Random(); @@ -40,7 +38,9 @@ public class JoyMod implements ModInitializer { ModItems.registerModItems(); ModBlocks.registerModBlocks(); ModEntities.registerBlockEntities(); - ModPaintings.registerPaintings(); + + // TODO: fix + // ModPaintings.registerPaintings(); if (Config.mobSpawning) { SpawnModifier.modifySpawning(); diff --git a/src/main/java/gay/pridecraft/joymod/JoyModClient.java b/src/main/java/gay/pridecraft/joymod/JoyModClient.java index 89a5c9c..31c7c8c 100644 --- a/src/main/java/gay/pridecraft/joymod/JoyModClient.java +++ b/src/main/java/gay/pridecraft/joymod/JoyModClient.java @@ -27,11 +27,11 @@ public class JoyModClient implements ClientModInitializer { registerEntityRenderers(); LivingEntityFeatureRendererRegistrationCallback.EVENT.register((entityType, entityRenderer, registrationHelper, context) -> { - Identifier elytra = new Identifier("minecraft:textures/entity/elytra.png"); + Identifier elytra = Identifier.ofVanilla("textures/entity/elytra.png"); registrationHelper.register(new CustomElytraFeatureRenderer<>(entityRenderer, context.getModelLoader(), elytra)); }); - ParticleFactoryRegistry.getInstance().register(ModParticles.TOTEM_OF_PRIDE_PARTICLE, TotemOfPrideParticle.Factory::new); + // ParticleFactoryRegistry.getInstance().register(ModParticles.TOTEM_OF_PRIDE_PARTICLE, TotemOfPrideParticle.Factory::new); } private static void registerBedBlockRenderLayers() { diff --git a/src/main/java/gay/pridecraft/joymod/block/ModBlocks.java b/src/main/java/gay/pridecraft/joymod/block/ModBlocks.java index 5b8f04a..9205546 100644 --- a/src/main/java/gay/pridecraft/joymod/block/ModBlocks.java +++ b/src/main/java/gay/pridecraft/joymod/block/ModBlocks.java @@ -2,12 +2,7 @@ package gay.pridecraft.joymod.block; import gay.pridecraft.joymod.JoyMod; import gay.pridecraft.joymod.block.custom.CustomBedBlock; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.CandleBlock; -import net.minecraft.block.CandleCakeBlock; +import net.minecraft.block.*; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.registry.Registries; @@ -17,161 +12,159 @@ import net.minecraft.util.Identifier; public class ModBlocks { public static final Block GAY_BED = registerBlock("gay_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.RED_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.RED_BED))); public static final Block ENBY_BED = registerBlock("enby_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.BLACK_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.BLACK_BED))); public static final Block INTERSEX_BED = registerBlock("intersex_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.GREEN_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.GREEN_BED))); public static final Block AGENDER_BED = registerBlock("agender_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.BROWN_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.BROWN_BED))); public static final Block BIGENDER_BED = registerBlock("bigender_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.BLUE_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.BLUE_BED))); public static final Block BISEXUAL_BED = registerBlock("bisexual_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.PURPLE_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.PURPLE_BED))); public static final Block MLM_BED = registerBlock("mlm_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.CYAN_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.CYAN_BED))); public static final Block ACE_BED = registerBlock("ace_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.LIGHT_GRAY_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.LIGHT_GRAY_BED))); public static final Block ARO_BED = registerBlock("aro_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.GRAY_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.GRAY_BED))); public static final Block APLATONIC_BED = registerBlock("aplatonic_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.PINK_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.PINK_BED))); public static final Block GENDER_FLUID_BED = registerBlock("gender_fluid_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.LIME_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.LIME_BED))); public static final Block PAN_BED = registerBlock("pan_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.YELLOW_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.YELLOW_BED))); public static final Block TRANS_BED = registerBlock("trans_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.LIGHT_BLUE_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.LIGHT_BLUE_BED))); public static final Block AROACE_BED = registerBlock("aroace_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.MAGENTA_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.MAGENTA_BED))); public static final Block LESBIAN_BED = registerBlock("lesbian_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.ORANGE_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.ORANGE_BED))); public static final Block PROGRESS_BED = registerBlock("progress_bed", - new CustomBedBlock(FabricBlockSettings.copyOf(Blocks.WHITE_BED))); + new CustomBedBlock(AbstractBlock.Settings.copy(Blocks.WHITE_BED))); public static final Block GAY_CANDLE = registerBlock("gay_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block ENBY_CANDLE = registerBlock("enby_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block INTERSEX_CANDLE = registerBlock("intersex_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block AGENDER_CANDLE = registerBlock("agender_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block BIGENDER_CANDLE = registerBlock("bigender_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block BISEXUAL_CANDLE = registerBlock("bisexual_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block MLM_CANDLE = registerBlock("mlm_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block ACE_CANDLE = registerBlock("ace_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block ARO_CANDLE = registerBlock("aro_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block APLATONIC_CANDLE = registerBlock("aplatonic_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block GENDER_FLUID_CANDLE = registerBlock("gender_fluid_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block PAN_CANDLE = registerBlock("pan_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block TRANS_CANDLE = registerBlock("trans_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block AROACE_CANDLE = registerBlock("aroace_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block LESBIAN_CANDLE = registerBlock("lesbian_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block PROGRESS_CANDLE = registerBlock("progress_candle", - new CandleBlock(FabricBlockSettings.copyOf(Blocks.CANDLE))); + new CandleBlock(AbstractBlock.Settings.copy(Blocks.CANDLE))); public static final Block GAY_CANDLE_CAKE = registerBlock("gay_candle_cake", - new CandleCakeBlock(GAY_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(GAY_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block ENBY_CANDLE_CAKE = registerBlock("enby_candle_cake", - new CandleCakeBlock(ENBY_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(ENBY_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block INTERSEX_CANDLE_CAKE = registerBlock("intersex_candle_cake", - new CandleCakeBlock(INTERSEX_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(INTERSEX_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block AGENDER_CANDLE_CAKE = registerBlock("agender_candle_cake", - new CandleCakeBlock(AGENDER_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(AGENDER_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block BIGENDER_CANDLE_CAKE = registerBlock("bigender_candle_cake", - new CandleCakeBlock(BIGENDER_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(BIGENDER_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block BISEXUAL_CANDLE_CAKE = registerBlock("bisexual_candle_cake", - new CandleCakeBlock(BISEXUAL_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(BISEXUAL_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block MLM_CANDLE_CAKE = registerBlock("mlm_candle_cake", - new CandleCakeBlock(MLM_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(MLM_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block ACE_CANDLE_CAKE = registerBlock("ace_candle_cake", - new CandleCakeBlock(ACE_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(ACE_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block ARO_CANDLE_CAKE = registerBlock("aro_candle_cake", - new CandleCakeBlock(ARO_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(ARO_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block APLATONIC_CANDLE_CAKE = registerBlock("aplatonic_candle_cake", - new CandleCakeBlock(APLATONIC_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(APLATONIC_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block GENDER_FLUID_CANDLE_CAKE = registerBlock("gender_fluid_candle_cake", - new CandleCakeBlock(GENDER_FLUID_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(GENDER_FLUID_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block PAN_CANDLE_CAKE = registerBlock("pan_candle_cake", - new CandleCakeBlock(PAN_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(PAN_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block TRANS_CANDLE_CAKE = registerBlock("trans_candle_cake", - new CandleCakeBlock(TRANS_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(TRANS_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block AROACE_CANDLE_CAKE = registerBlock("aroace_candle_cake", - new CandleCakeBlock(AROACE_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(AROACE_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block LESBIAN_CANDLE_CAKE = registerBlock("lesbian_candle_cake", - new CandleCakeBlock(LESBIAN_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(LESBIAN_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); public static final Block PROGRESS_CANDLE_CAKE = registerBlock("progress_candle_cake", - new CandleCakeBlock(PROGRESS_CANDLE, FabricBlockSettings.copyOf(Blocks.CANDLE_CAKE))); + new CandleCakeBlock(PROGRESS_CANDLE, AbstractBlock.Settings.copy(Blocks.CANDLE_CAKE))); private static Block registerBlock(String name, Block block) { registerBlockItem(name, block); - return Registry.register(Registries.BLOCK, new Identifier(JoyMod.MOD_ID, name), block); + return Registry.register(Registries.BLOCK, Identifier.of(JoyMod.MOD_ID, name), block); } private static Item registerBlockItem(String name, Block block) { - - return Registry.register(Registries.ITEM, new Identifier(JoyMod.MOD_ID, name), - new BlockItem(block, new FabricItemSettings())); - + return Registry.register(Registries.ITEM, Identifier.of(JoyMod.MOD_ID, name), + new BlockItem(block, new Item.Settings())); } public static void registerModBlocks() { diff --git a/src/main/java/gay/pridecraft/joymod/datagen/ModLootTableProvider.java b/src/main/java/gay/pridecraft/joymod/datagen/ModLootTableProvider.java index 1b49149..67eab91 100644 --- a/src/main/java/gay/pridecraft/joymod/datagen/ModLootTableProvider.java +++ b/src/main/java/gay/pridecraft/joymod/datagen/ModLootTableProvider.java @@ -2,10 +2,13 @@ package gay.pridecraft.joymod.datagen; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.minecraft.registry.RegistryWrapper; + +import java.util.concurrent.CompletableFuture; public class ModLootTableProvider extends FabricBlockLootTableProvider { - public ModLootTableProvider(FabricDataOutput dataOutput) { - super(dataOutput); + public ModLootTableProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, registryLookup); } @Override diff --git a/src/main/java/gay/pridecraft/joymod/datagen/ModRecipeProvider.java b/src/main/java/gay/pridecraft/joymod/datagen/ModRecipeProvider.java index 746cc20..1022f94 100644 --- a/src/main/java/gay/pridecraft/joymod/datagen/ModRecipeProvider.java +++ b/src/main/java/gay/pridecraft/joymod/datagen/ModRecipeProvider.java @@ -3,11 +3,14 @@ package gay.pridecraft.joymod.datagen; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.data.server.recipe.RecipeExporter; +import net.minecraft.registry.RegistryWrapper; + +import java.util.concurrent.CompletableFuture; public class ModRecipeProvider extends FabricRecipeProvider { - public ModRecipeProvider(FabricDataOutput output) { - super(output); + public ModRecipeProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); } @Override diff --git a/src/main/java/gay/pridecraft/joymod/entity/ModEntities.java b/src/main/java/gay/pridecraft/joymod/entity/ModEntities.java index 19bb02b..706d5e4 100644 --- a/src/main/java/gay/pridecraft/joymod/entity/ModEntities.java +++ b/src/main/java/gay/pridecraft/joymod/entity/ModEntities.java @@ -4,10 +4,7 @@ import gay.pridecraft.joymod.JoyMod; import gay.pridecraft.joymod.entity.custom.CustomBedBlockEntity; import gay.pridecraft.joymod.block.ModBlocks; import gay.pridecraft.joymod.entity.custom.living.*; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; -import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -16,8 +13,8 @@ import net.minecraft.util.Identifier; public class ModEntities { public static final BlockEntityType CUSTOM_BED_BLOCK_ENTITY = Registry.register( Registries.BLOCK_ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "pride_blocks"), - FabricBlockEntityTypeBuilder.create(CustomBedBlockEntity::new, + Identifier.of(JoyMod.MOD_ID, "pride_blocks"), + BlockEntityType.Builder.create(CustomBedBlockEntity::new, ModBlocks.ACE_BED, ModBlocks.AGENDER_BED, ModBlocks.APLATONIC_BED, @@ -38,51 +35,57 @@ public class ModEntities { ); public static final EntityType THIGH_HIGH_FOX = Registry.register( - Registries.ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "thigh_high_fox"), - FabricEntityTypeBuilder.create(EntityType.FOX.getSpawnGroup(), CustomFoxEntity.ThighHighFoxEntity::new) - .dimensions(EntityDimensions.fixed(0.6f, 0.7f)) - .trackRangeBlocks(8).build() + Registries.ENTITY_TYPE, + Identifier.of(JoyMod.MOD_ID, "thigh_high_fox"), + EntityType.Builder.create(CustomFoxEntity.ThighHighFoxEntity::new, EntityType.FOX.getSpawnGroup()) + .dimensions(0.6f, 0.7f) + .maxTrackingRange(8) + .build() ); public static final EntityType PRIDE_BII = Registry.register( - Registries.ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "pride_bii"), - FabricEntityTypeBuilder.create(EntityType.BEE.getSpawnGroup(), CustomBeeEntity.PrideBiiEntity::new) - .dimensions(EntityDimensions.fixed(0.7f, 0.6f)) - .trackRangeBlocks(8).build() + Registries.ENTITY_TYPE, + Identifier.of(JoyMod.MOD_ID, "pride_bii"), + EntityType.Builder.create(CustomBeeEntity.PrideBiiEntity::new, EntityType.BEE.getSpawnGroup()) + .dimensions(0.7f, 0.6f) + .maxTrackingRange(8) + .build() ); public static final EntityType PRIDE_AXOLOTL = Registry.register( - Registries.ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "pride_axolotl"), - FabricEntityTypeBuilder.create(EntityType.AXOLOTL.getSpawnGroup(), CustomAxolotlEntity.PrideAxolotlEntity::new) - .dimensions(EntityDimensions.fixed(0.75F, 0.42F)) - .trackRangeBlocks(10).build() + Registries.ENTITY_TYPE, + Identifier.of(JoyMod.MOD_ID, "pride_axolotl"), + EntityType.Builder.create(CustomAxolotlEntity.PrideAxolotlEntity::new, EntityType.AXOLOTL.getSpawnGroup()) + .dimensions(0.75F, 0.42F) + .maxTrackingRange(10) + .build() ); public static final EntityType PRIDE_FROG = Registry.register( - Registries.ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "pride_frog"), - FabricEntityTypeBuilder.create(EntityType.FROG.getSpawnGroup(), CustomFrogEntity.PrideFrogEntity::new) - .dimensions(EntityDimensions.fixed(0.5F, 0.5f)) - .trackRangeBlocks(10).build() + Registries.ENTITY_TYPE, + Identifier.of(JoyMod.MOD_ID, "pride_frog"), + EntityType.Builder.create(CustomFrogEntity.PrideFrogEntity::new, EntityType.FROG.getSpawnGroup()) + .dimensions(0.5F, 0.5f) + .maxTrackingRange(10) + .build() ); public static final EntityType PRIDE_SLIME = Registry.register( - Registries.ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "pride_slime"), - FabricEntityTypeBuilder.create(EntityType.SLIME.getSpawnGroup(), CustomSlimeEntity.PrideSlimeEntity::new) - .dimensions(EntityDimensions.changing(2.04F, 2.04F)) - .trackRangeBlocks(10).build() + Registries.ENTITY_TYPE, + Identifier.of(JoyMod.MOD_ID, "pride_slime"), + EntityType.Builder.create(CustomSlimeEntity.PrideSlimeEntity::new, EntityType.SLIME.getSpawnGroup()) + .dimensions(0.5f, 0.5f) + .maxTrackingRange(10) + .build() ); public static final EntityType PRIDE_SNIFFER = Registry.register( - Registries.ENTITY_TYPE, - new Identifier(JoyMod.MOD_ID, "pride_sniffer"), - FabricEntityTypeBuilder.create(EntityType.SNIFFER.getSpawnGroup(), CustomSnifferEntity.PrideSnifferEntity::new) - .dimensions(EntityDimensions.fixed(1.9F, 1.75F)) - .trackRangeBlocks(10).build() + Registries.ENTITY_TYPE, + Identifier.of(JoyMod.MOD_ID, "pride_sniffer"), + EntityType.Builder.create(CustomSnifferEntity.PrideSnifferEntity::new, EntityType.SNIFFER.getSpawnGroup()) + .dimensions(1.9F, 1.75F) + .maxTrackingRange(10) + .build() ); public static void registerBlockEntities() { diff --git a/src/main/java/gay/pridecraft/joymod/item/ModItemGroups.java b/src/main/java/gay/pridecraft/joymod/item/ModItemGroups.java index 91c3bb7..bf8f411 100644 --- a/src/main/java/gay/pridecraft/joymod/item/ModItemGroups.java +++ b/src/main/java/gay/pridecraft/joymod/item/ModItemGroups.java @@ -13,7 +13,7 @@ import net.minecraft.util.Identifier; public class ModItemGroups { public static final ItemGroup JOYMOD_GROUP = Registry.register(Registries.ITEM_GROUP, - new Identifier(JoyMod.MOD_ID, "joymod"), + Identifier.of(JoyMod.MOD_ID, "joymod"), FabricItemGroup.builder().displayName(Text.translatable("itemgroup.joymod_group")) .icon(() -> new ItemStack(ModItems.PRIDE_BRUSH)).entries((displayContext, entries) -> { diff --git a/src/main/java/gay/pridecraft/joymod/item/ModItems.java b/src/main/java/gay/pridecraft/joymod/item/ModItems.java index def0a93..2671103 100644 --- a/src/main/java/gay/pridecraft/joymod/item/ModItems.java +++ b/src/main/java/gay/pridecraft/joymod/item/ModItems.java @@ -5,7 +5,6 @@ import gay.pridecraft.joymod.JoyMod; import gay.pridecraft.joymod.entity.ModEntities; import gay.pridecraft.joymod.item.custom.CustomElytraItem; import gay.pridecraft.joymod.item.custom.RainbowSpawnEggItem; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.BrushItem; import net.minecraft.item.Item; import net.minecraft.registry.Registries; @@ -14,21 +13,21 @@ import net.minecraft.util.Identifier; public class ModItems { public static final Item PRIDE_ELYTRA = registerItem("pride_elytra", - new CustomElytraItem(new FabricItemSettings().maxCount(1))); + new CustomElytraItem(new Item.Settings().maxCount(1))); public static final Item TOTEM_OF_PRIDE = registerItem("totem_of_pride", - new Item(new FabricItemSettings().maxCount(1))); - public static final Item PRIDE_BRUSH = registerItem("pride_brush", new BrushItem(new FabricItemSettings())); - public static final Item PRIDE_SLIME_BALL = registerItem("pride_slime_ball", new Item(new FabricItemSettings())); - public static final Item THIGH_HIGH_FOX_SPAWN_EGG = registerItem("thigh_high_fox_spawn_egg", new RainbowSpawnEggItem(ModEntities.THIGH_HIGH_FOX, 14005919, 0xff80bf, new FabricItemSettings())); - public static final Item PRIDE_BII_SPAWN_EGG = registerItem("pride_bii_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_BII, 15582019, 0xFF69B4, new FabricItemSettings())); - public static final Item PRIDE_AXOLOTL_SPAWN_EGG = registerItem("pride_axolotl_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_AXOLOTL, 16499171, 0xff80bf, new FabricItemSettings())); - public static final Item PRIDE_FROG_SPAWN_EGG = registerItem("pride_frog_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_FROG, 13661252, 0xff80bf, new FabricItemSettings())); - public static final Item PRIDE_SLIME_SPAWN_EGG = registerItem("pride_slime_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_SLIME, 5349438, 0xff80bf, new FabricItemSettings())); - public static final Item PRIDE_SNIFFER_SPAWN_EGG = registerItem("pride_sniffer_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_SNIFFER, 8855049, 0xff80bf, new FabricItemSettings())); + new Item(new Item.Settings().maxCount(1))); + public static final Item PRIDE_BRUSH = registerItem("pride_brush", new BrushItem(new Item.Settings())); + public static final Item PRIDE_SLIME_BALL = registerItem("pride_slime_ball", new Item(new Item.Settings())); + public static final Item THIGH_HIGH_FOX_SPAWN_EGG = registerItem("thigh_high_fox_spawn_egg", new RainbowSpawnEggItem(ModEntities.THIGH_HIGH_FOX, 14005919, 0xff80bf, new Item.Settings())); + public static final Item PRIDE_BII_SPAWN_EGG = registerItem("pride_bii_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_BII, 15582019, 0xFF69B4, new Item.Settings())); + public static final Item PRIDE_AXOLOTL_SPAWN_EGG = registerItem("pride_axolotl_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_AXOLOTL, 16499171, 0xff80bf, new Item.Settings())); + public static final Item PRIDE_FROG_SPAWN_EGG = registerItem("pride_frog_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_FROG, 13661252, 0xff80bf, new Item.Settings())); + public static final Item PRIDE_SLIME_SPAWN_EGG = registerItem("pride_slime_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_SLIME, 5349438, 0xff80bf, new Item.Settings())); + public static final Item PRIDE_SNIFFER_SPAWN_EGG = registerItem("pride_sniffer_spawn_egg", new RainbowSpawnEggItem(ModEntities.PRIDE_SNIFFER, 8855049, 0xff80bf, new Item.Settings())); private static Item registerItem(String name, Item item) { - return Registry.register(Registries.ITEM, new Identifier(JoyMod.MOD_ID, name), item); + return Registry.register(Registries.ITEM, Identifier.of(JoyMod.MOD_ID, name), item); } public static void registerModItems() { diff --git a/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java b/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java index 86bf905..5fae8fd 100644 --- a/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java +++ b/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java @@ -7,6 +7,7 @@ import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; public class ModPaintings { + /* TODO: Properly update to 1.21 public static final PaintingVariant ACE = registerPainting("ace", new PaintingVariant(32, 16)); public static final PaintingVariant AGENDER = registerPainting("agender", new PaintingVariant(16, 16)); public static final PaintingVariant ARO = registerPainting("aro", new PaintingVariant(32, 16)); @@ -25,10 +26,11 @@ public class ModPaintings { public static final PaintingVariant TRANS = registerPainting("trans", new PaintingVariant(32, 32)); private static PaintingVariant registerPainting(String name, PaintingVariant paintingVariant) { - return Registry.register(Registries.PAINTING_VARIANT, new Identifier(JoyMod.MOD_ID, name), paintingVariant); + return Registry.register(Registries.PAINTING_VARIANT, Identifier.of(JoyMod.MOD_ID, name), paintingVariant); } public static void registerPaintings() { JoyMod.LOGGER.info("Registering Paintings for " + JoyMod.MOD_ID); } + */ } \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/joymod/particle/ModParticles.java b/src/main/java/gay/pridecraft/joymod/particle/ModParticles.java index 5025ffd..ff5b681 100644 --- a/src/main/java/gay/pridecraft/joymod/particle/ModParticles.java +++ b/src/main/java/gay/pridecraft/joymod/particle/ModParticles.java @@ -2,16 +2,16 @@ package gay.pridecraft.joymod.particle; import gay.pridecraft.joymod.JoyMod; import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes; -import net.minecraft.particle.DefaultParticleType; +import net.minecraft.particle.SimpleParticleType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; public class ModParticles { - public static final DefaultParticleType TOTEM_OF_PRIDE_PARTICLE = FabricParticleTypes.simple(); + public static final SimpleParticleType TOTEM_OF_PRIDE_PARTICLE = FabricParticleTypes.simple(); public static void registerParticles() { - Registry.register(Registries.PARTICLE_TYPE, new Identifier(JoyMod.MOD_ID, "totem_of_pride_particle"), + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(JoyMod.MOD_ID, "totem_of_pride_particle"), TOTEM_OF_PRIDE_PARTICLE); } } \ No newline at end of file diff --git a/src/main/java/gay/pridecraft/joymod/particle/TotemOfPrideParticle.java b/src/main/java/gay/pridecraft/joymod/particle/TotemOfPrideParticle.java index 88f4ff2..001b16a 100644 --- a/src/main/java/gay/pridecraft/joymod/particle/TotemOfPrideParticle.java +++ b/src/main/java/gay/pridecraft/joymod/particle/TotemOfPrideParticle.java @@ -4,9 +4,10 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.particle.*; import net.minecraft.client.world.ClientWorld; -import net.minecraft.particle.DefaultParticleType; import net.minecraft.client.particle.AnimatedParticle; import net.minecraft.client.particle.SpriteProvider; +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.SimpleParticleType; import java.util.Arrays; import java.util.List; @@ -52,7 +53,7 @@ public class TotemOfPrideParticle extends AnimatedParticle { } @Environment(EnvType.CLIENT) - public static class Factory implements ParticleFactory { + public static class Factory implements ParticleFactory { private static int colorCounter = 0; private final SpriteProvider spriteProvider; @@ -61,7 +62,7 @@ public class TotemOfPrideParticle extends AnimatedParticle { } public Particle createParticle( - DefaultParticleType defaultParticleType, ClientWorld clientWorld, double d, double e, double f, double g, double h, double i + SimpleParticleType defaultParticleType, ClientWorld clientWorld, double d, double e, double f, double g, double h, double i ) { int colorIndex = colorCounter % LGBT_COLORS.size(); colorCounter++; diff --git a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideAxolotlRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideAxolotlRenderer.java index 0273394..8c9c666 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideAxolotlRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideAxolotlRenderer.java @@ -19,11 +19,11 @@ public class PrideAxolotlRenderer extends MobEntityRenderer TEXTURES = new HashMap<>(); static { - TEXTURES.put(AxolotlEntity.Variant.BLUE, new Identifier(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_blue.png")); - TEXTURES.put(AxolotlEntity.Variant.GOLD, new Identifier(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_gold.png")); - TEXTURES.put(AxolotlEntity.Variant.CYAN, new Identifier(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_cyan.png")); - TEXTURES.put(AxolotlEntity.Variant.LUCY, new Identifier(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_lucy.png")); - TEXTURES.put(AxolotlEntity.Variant.WILD, new Identifier(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_wild.png")); + TEXTURES.put(AxolotlEntity.Variant.BLUE, Identifier.of(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_blue.png")); + TEXTURES.put(AxolotlEntity.Variant.GOLD, Identifier.of(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_gold.png")); + TEXTURES.put(AxolotlEntity.Variant.CYAN, Identifier.of(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_cyan.png")); + TEXTURES.put(AxolotlEntity.Variant.LUCY, Identifier.of(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_lucy.png")); + TEXTURES.put(AxolotlEntity.Variant.WILD, Identifier.of(JoyMod.MOD_ID, "textures/entity/axolotl/pride_axolotl_wild.png")); } public PrideAxolotlRenderer(EntityRendererFactory.Context context) { diff --git a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideBiiRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideBiiRenderer.java index 94a5a1d..fb233bb 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideBiiRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideBiiRenderer.java @@ -12,10 +12,10 @@ import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) public class PrideBiiRenderer extends MobEntityRenderer> { - private static final Identifier ANGRY_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/bee/pride_bii_angry.png"); - private static final Identifier ANGRY_NECTAR_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/bee/pride_bii_angry_nectar.png"); - private static final Identifier PASSIVE_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/bee/pride_bii.png"); - private static final Identifier NECTAR_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/bee/pride_bii_nectar.png"); + private static final Identifier ANGRY_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/bee/pride_bii_angry.png"); + private static final Identifier ANGRY_NECTAR_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/bee/pride_bii_angry_nectar.png"); + private static final Identifier PASSIVE_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/bee/pride_bii.png"); + private static final Identifier NECTAR_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/bee/pride_bii_nectar.png"); public PrideBiiRenderer(EntityRendererFactory.Context context) { super(context, new PrideBiiEntityModel<>(context.getPart(EntityModelLayers.BEE)), 0.4F); diff --git a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideFrogRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideFrogRenderer.java index 2432bfc..3e43d93 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideFrogRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideFrogRenderer.java @@ -12,9 +12,9 @@ import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) public class PrideFrogRenderer extends MobEntityRenderer> { - private static final Identifier TEMPERATE_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/pride_temperate_frog.png"); - private static final Identifier WARM_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/pride_warm_frog.png"); - private static final Identifier COLD_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/frog/pride_cold_frog.png"); + private static final Identifier TEMPERATE_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/frog/pride_temperate_frog.png"); + private static final Identifier WARM_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/frog/pride_warm_frog.png"); + private static final Identifier COLD_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/frog/pride_cold_frog.png"); public PrideFrogRenderer(EntityRendererFactory.Context context) { super(context, new PrideFrogEntityModel<>(context.getPart(EntityModelLayers.FROG)), 0.3F); @@ -22,13 +22,12 @@ public class PrideFrogRenderer extends MobEntityRenderer WARM_TEXTURE; - case "cold_frog" -> COLD_TEXTURE; + return switch (entity.getVariant().getKey().get().getValue().getPath()) { + case "warm" -> WARM_TEXTURE; + case "cold" -> COLD_TEXTURE; default -> TEMPERATE_TEXTURE; }; } diff --git a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSlimeRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSlimeRenderer.java index 34766a9..98ea00c 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSlimeRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSlimeRenderer.java @@ -16,7 +16,7 @@ import net.minecraft.util.math.MathHelper; @Environment(EnvType.CLIENT) public class PrideSlimeRenderer extends MobEntityRenderer> { - private static final Identifier TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/slime/pride_slime.png"); + private static final Identifier TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/slime/pride_slime.png"); public PrideSlimeRenderer(EntityRendererFactory.Context context) { super(context, new PrideSlimeEntityModel<>(context.getPart(EntityModelLayers.SLIME)), 0.25F); diff --git a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSnifferRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSnifferRenderer.java index ea8b880..d260f3f 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSnifferRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/entity/PrideSnifferRenderer.java @@ -12,7 +12,7 @@ import net.minecraft.util.Identifier; @Environment(EnvType.CLIENT) public class PrideSnifferRenderer extends MobEntityRenderer> { - private static final Identifier TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/sniffer/pride_sniffer.png"); + private static final Identifier TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/sniffer/pride_sniffer.png"); public PrideSnifferRenderer(EntityRendererFactory.Context context) { super(context, new PrideSnifferEntityModel<>(context.getPart(EntityModelLayers.SNIFFER)), 1.1F); diff --git a/src/main/java/gay/pridecraft/joymod/renderer/entity/ThighHighFoxRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/entity/ThighHighFoxRenderer.java index fbe4e25..9af4475 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/entity/ThighHighFoxRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/entity/ThighHighFoxRenderer.java @@ -17,20 +17,20 @@ import net.minecraft.util.math.RotationAxis; @Environment(EnvType.CLIENT) public class ThighHighFoxRenderer extends MobEntityRenderer> { - private static final Identifier TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_fox.png"); - private static final Identifier SLEEPING_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_fox_sleep.png"); - private static final Identifier SNOW_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_snow_fox.png"); - private static final Identifier SLEEPING_SNOW_TEXTURE = new Identifier(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_snow_fox_sleep.png"); + private static final Identifier TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_fox.png"); + private static final Identifier SLEEPING_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_fox_sleep.png"); + private static final Identifier SNOW_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_snow_fox.png"); + private static final Identifier SLEEPING_SNOW_TEXTURE = Identifier.of(JoyMod.MOD_ID, "textures/entity/fox/thigh_high_snow_fox_sleep.png"); public ThighHighFoxRenderer(EntityRendererFactory.Context context) { super(context, new ThighHighFoxEntityModel<>(context.getPart(EntityModelLayers.FOX)), 0.4F); this.addFeature(new ThighHighFoxHeldItemFeatureRenderer(this, context.getHeldItemRenderer())); } - protected void setupTransforms(CustomFoxEntity.ThighHighFoxEntity thighHighFoxEntity, MatrixStack matrixStack, float f, float g, float h) { - super.setupTransforms(thighHighFoxEntity, matrixStack, f, g, h); + protected void setupTransforms(CustomFoxEntity.ThighHighFoxEntity thighHighFoxEntity, MatrixStack matrixStack, float animationProgress, float bodyYaw, float tickDelta, float scale) { + super.setupTransforms(thighHighFoxEntity, matrixStack, animationProgress, bodyYaw, tickDelta, scale); if (thighHighFoxEntity.isChasing() || thighHighFoxEntity.isWalking()) { - float i = -MathHelper.lerp(h, thighHighFoxEntity.prevPitch, thighHighFoxEntity.getPitch()); + float i = -MathHelper.lerp(tickDelta, thighHighFoxEntity.prevPitch, thighHighFoxEntity.getPitch()); matrixStack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(i)); } } diff --git a/src/main/java/gay/pridecraft/joymod/renderer/feature/CustomElytraFeatureRenderer.java b/src/main/java/gay/pridecraft/joymod/renderer/feature/CustomElytraFeatureRenderer.java index b9fa6dd..a86c6da 100644 --- a/src/main/java/gay/pridecraft/joymod/renderer/feature/CustomElytraFeatureRenderer.java +++ b/src/main/java/gay/pridecraft/joymod/renderer/feature/CustomElytraFeatureRenderer.java @@ -36,7 +36,7 @@ public class CustomElytraFeatureRenderer(); - this.elytraTextures.put(ModItems.PRIDE_ELYTRA, new Identifier(JoyMod.MOD_ID + ":textures/entity/pride_elytra.png")); + this.elytraTextures.put(ModItems.PRIDE_ELYTRA, Identifier.of(JoyMod.MOD_ID + ":textures/entity/pride_elytra.png")); this.elytra = new ElytraEntityModel<>(loader.getModelPart(EntityModelLayers.ELYTRA)); } @@ -53,9 +53,9 @@ public class CustomElytraFeatureRenderer extends Fe this.getContextModel().copyStateTo(this.model); this.model.animateModel(livingEntity, f, g, h); this.model.setAngles(livingEntity, f, g, j, k, l); - this.model.render(matrixStack, vertexConsumer, i, LivingEntityRenderer.getOverlay(livingEntity, 0.0F), 1.0F, 1.0F, 1.0F, 1.0F); + this.model.render(matrixStack, vertexConsumer, i, LivingEntityRenderer.getOverlay(livingEntity, 0.0F)); } } } diff --git a/src/main/java/gay/pridecraft/joymod/util/BedTextureProvider.java b/src/main/java/gay/pridecraft/joymod/util/BedTextureProvider.java index 5e6d1e2..fcd4c31 100644 --- a/src/main/java/gay/pridecraft/joymod/util/BedTextureProvider.java +++ b/src/main/java/gay/pridecraft/joymod/util/BedTextureProvider.java @@ -40,11 +40,11 @@ public class BedTextureProvider { } } - public static final Identifier BEDS_ATLAS_TEXTURE = new Identifier("textures/atlas/beds.png"); + public static final Identifier BEDS_ATLAS_TEXTURE = Identifier.of("textures/atlas/beds.png"); public static final SpriteIdentifier[] BED_TEXTURES = BEDS.stream() .map(bedBlock -> { - Identifier bedTextureId = new Identifier(JoyMod.MOD_ID, "entity/bed/" + extractBedName(bedBlock.getTranslationKey())); + Identifier bedTextureId = Identifier.of(JoyMod.MOD_ID, "entity/bed/" + extractBedName(bedBlock.getTranslationKey())); return new SpriteIdentifier(BEDS_ATLAS_TEXTURE, bedTextureId); }) .toArray(SpriteIdentifier[]::new);