From a2ccfd8b9f1ee1e78db7579d42137ef2bd078c34 Mon Sep 17 00:00:00 2001 From: Partonetrain Date: Sat, 4 Jan 2025 01:25:25 -0600 Subject: [PATCH 1/2] ResourceLocation/Key chore - new ResourceLocation(Quark.MOD_ID -> Quark.asResource( - new ResourceLocation(string) -> ResourceLocation.Parse(, EXCEPT when it's a vanilla asset and EXCEPT in client model ItemProperties code, but the latter may need a second pass because I'm not familiar with the convention - getDefaultLootTable now returns ResourceKey - new TagKey( -> Quark.asTagKey(, this new method technically makes modules classload Registries but that is probably fine :clueless: --- .../client/render/be/PipeRenderer.java | 2 +- .../client/render/be/TinyPotatoRenderer.java | 3 +- .../screen/BackpackInventoryScreen.java | 2 +- .../oddities/client/screen/CrateScreen.java | 2 +- .../client/screen/MatrixEnchantingScreen.java | 2 +- .../oddities/inventory/EnchantmentMatrix.java | 2 +- .../oddities/module/BackpackModule.java | 4 +- .../addons/oddities/module/MagnetsModule.java | 2 +- .../module/MatrixEnchantingModule.java | 2 +- .../addons/oddities/module/PipesModule.java | 4 +- .../oddities/module/TinyPotatoModule.java | 6 +- .../java/org/violetmoon/quark/base/Quark.java | 11 +++- .../base/capability/CapabilityHandler.java | 8 +-- .../client/config/QuarkConfigHomeScreen.java | 2 +- .../base/client/config/SocialButton.java | 2 +- .../quark/base/client/handler/ClientUtil.java | 2 +- .../base/client/handler/ModelHandler.java | 2 +- .../base/client/render/QuarkBoatRenderer.java | 2 +- .../handler/ContributorRewardHandler.java | 2 +- .../quark/base/handler/QuarkRemapHandler.java | 2 +- .../quark/base/handler/QuarkSounds.java | 2 +- .../quark/base/handler/SortingHandler.java | 2 +- .../quark/base/recipe/ExclusionRecipe.java | 8 +-- .../QuarkPistonBlockEntityRenderer.java | 2 +- .../module/FeedingTroughModule.java | 2 +- .../automation/module/IronRodModule.java | 3 +- .../module/PistonsMoveTileEntitiesModule.java | 2 +- .../render/be/VariantChestRenderer.java | 2 +- .../render/entity/GlassItemFrameRenderer.java | 2 +- .../content/building/module/HedgesModule.java | 3 +- .../building/module/HollowLogsModule.java | 3 +- .../building/module/RainbowLampsModule.java | 3 +- .../content/building/module/StoolsModule.java | 2 +- .../building/module/VariantChestsModule.java | 10 ++-- .../building/module/VerticalSlabsModule.java | 3 +- .../building/module/WoodenPostsModule.java | 3 +- .../module/BucketsShowInhabitantsModule.java | 10 ++-- .../content/client/module/CameraModule.java | 60 +++++++++---------- .../client/module/GreenerGrassModule.java | 2 +- .../client/module/UsesForCursesModule.java | 2 +- .../module/VariantAnimalTexturesModule.java | 12 ++-- .../client/resources/AttributeIconEntry.java | 4 +- .../resources/AttributeTooltipManager.java | 2 +- .../client/tooltip/AttributeTooltips.java | 6 +- .../client/tooltip/EnchantedBookTooltips.java | 4 +- .../content/client/tooltip/MapTooltips.java | 2 +- .../client/tooltip/ShulkerBoxTooltips.java | 2 +- .../experimental/config/VariantsConfig.java | 6 +- .../module/EnchantmentPredicatesModule.java | 2 +- .../module/EnchantmentsBegoneModule.java | 2 +- .../module/VariantSelectorModule.java | 2 +- .../client/screen/HeldShulkerBoxScreen.java | 2 +- .../module/HotbarChangerModule.java | 2 +- .../mobs/client/layer/CrabMoldLayer.java | 2 +- .../client/layer/FoxhoundCollarLayer.java | 2 +- .../client/layer/StonelingLichenLayer.java | 2 +- .../mobs/client/layer/ToretoiseOreLayer.java | 2 +- .../forgotten/ForgottenClothingLayer.java | 2 +- .../layer/forgotten/ForgottenEyesLayer.java | 2 +- .../client/layer/shiba/ShibaCollarLayer.java | 2 +- .../client/render/entity/CrabRenderer.java | 7 ++- .../render/entity/ForgottenRenderer.java | 2 +- .../render/entity/FoxhoundRenderer.java | 18 +++--- .../client/render/entity/ShibaRenderer.java | 10 ++-- .../render/entity/ToretoiseRenderer.java | 2 +- .../client/render/entity/WraithRenderer.java | 3 +- .../quark/content/mobs/entity/Crab.java | 10 ++-- .../quark/content/mobs/entity/Forgotten.java | 8 ++- .../quark/content/mobs/entity/Foxhound.java | 9 ++- .../quark/content/mobs/entity/Stoneling.java | 9 ++- .../quark/content/mobs/entity/Toretoise.java | 4 +- .../quark/content/mobs/entity/Wraith.java | 11 ++-- .../content/mobs/module/CrabsModule.java | 2 +- .../content/mobs/module/FoxhoundModule.java | 2 +- .../content/mobs/module/WraithModule.java | 4 +- .../tools/client/render/GlintRenderTypes.java | 2 +- .../render/entity/TorchArrowRenderer.java | 4 +- .../tools/item/PathfindersQuillItem.java | 2 +- .../quark/content/tools/item/RuneItem.java | 18 +++--- .../content/tools/loot/InBiomeCondition.java | 2 +- .../content/tools/module/AbacusModule.java | 3 +- .../tools/module/AncientTomesModule.java | 8 +-- .../tools/module/BeaconRedirectionModule.java | 3 +- .../tools/module/ParrotEggsModule.java | 4 +- .../tools/module/PathfinderMapsModule.java | 6 +- .../content/tools/module/PickarangModule.java | 4 +- .../content/tools/module/SeedPouchModule.java | 2 +- .../tools/module/SkullPikesModule.java | 2 +- .../tools/module/SlimeInABucketModule.java | 3 +- .../tools/module/TorchArrowModule.java | 2 +- .../client/emote/CustomEmoteDescriptor.java | 5 +- .../emote/CustomEmoteIconResourcePack.java | 4 +- .../tweaks/client/emote/EmoteDescriptor.java | 13 ++-- .../tweaks/client/emote/EmoteTemplate.java | 2 +- .../module/CompassesWorkEverywhereModule.java | 5 +- .../tweaks/module/DiamondRepairModule.java | 4 +- .../module/DoubleDoorOpeningModule.java | 3 +- .../tweaks/module/EnhancedLaddersModule.java | 5 +- .../tweaks/module/GlassShardModule.java | 3 +- .../tweaks/module/HoeHarvestingModule.java | 3 +- .../module/NoDurabilityOnCosmeticsModule.java | 3 +- .../module/ReacharoundPlacingModule.java | 7 ++- .../tweaks/module/SimpleHarvestModule.java | 5 +- .../world/gen/ObsidianSpikeGenerator.java | 2 +- .../world/module/BigStoneClustersModule.java | 2 +- .../world/module/BlossomTreesModule.java | 2 +- .../content/world/module/CorundumModule.java | 3 +- .../world/module/FairyRingsModule.java | 2 +- .../world/module/FallenLogsModule.java | 8 +-- .../world/module/GlimmeringWealdModule.java | 6 +- .../world/module/MonsterBoxModule.java | 4 +- .../base/UndergroundStyle.java | 3 +- .../integration/jei/InfluenceCategory.java | 4 +- .../quark/integration/jei/QuarkJeiPlugin.java | 2 +- .../client/LootrVariantChestRenderer.java | 2 +- 115 files changed, 281 insertions(+), 239 deletions(-) diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java index 81fb41699b..cc692d4562 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/PipeRenderer.java @@ -34,7 +34,7 @@ public class PipeRenderer implements BlockEntityRenderer { - private static final ModelResourceLocation LOCATION_MODEL = new ModelResourceLocation(new ResourceLocation(Quark.MOD_ID, "extra/pipe_flare"), "inventory"); + private static final ModelResourceLocation LOCATION_MODEL = new ModelResourceLocation(Quark.asResource("extra/pipe_flare"), "inventory"); private final Random random = new Random(); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java index 408a19725e..aa63ecbc5c 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/render/be/TinyPotatoRenderer.java @@ -27,6 +27,7 @@ import org.violetmoon.quark.addons.oddities.block.be.TinyPotatoBlockEntity; import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; import org.violetmoon.quark.addons.oddities.util.TinyPotatoInfo; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tools.base.RuneColor; import org.violetmoon.quark.content.tools.module.ColorRunesModule; import org.violetmoon.quark.mixin.mixins.client.accessor.AccessorModelManager; @@ -76,7 +77,7 @@ private static BakedModel getModel(String name, boolean angry) { } private static ResourceLocation taterLocation(String name) { - return new ResourceLocation("quark", "tiny_potato/" + normalizeName(name)); + return Quark.asResource( "tiny_potato/" + normalizeName(name)); } private static String normalizeName(String name) { diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java index c53d7fe4d3..6185a51cd5 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/BackpackInventoryScreen.java @@ -28,7 +28,7 @@ public class BackpackInventoryScreen extends InventoryScreen implements IQuarkButtonAllowed { - private static final ResourceLocation BACKPACK_INVENTORY_BACKGROUND = new ResourceLocation(Quark.MOD_ID, "textures/misc/backpack_gui.png"); + private static final ResourceLocation BACKPACK_INVENTORY_BACKGROUND = Quark.asResource("textures/misc/backpack_gui.png"); private final Player player; private final Map buttonYs = new HashMap<>(); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java index 9fc23cc982..82301362b5 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/CrateScreen.java @@ -24,7 +24,7 @@ import net.minecraft.world.entity.player.Inventory; public class CrateScreen extends AbstractContainerScreen implements IQuarkButtonAllowed { - private static final ResourceLocation TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/gui/crate.png"); + private static final ResourceLocation TEXTURE = Quark.asResource("textures/gui/crate.png"); private int lastScroll; private int scrollOffs; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java index 965112dea4..3eec9ecc81 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/client/screen/MatrixEnchantingScreen.java @@ -35,7 +35,7 @@ public class MatrixEnchantingScreen extends AbstractContainerScreen { - public static final ResourceLocation BACKGROUND = new ResourceLocation(Quark.MOD_ID, "textures/misc/matrix_enchanting.png"); + public static final ResourceLocation BACKGROUND = Quark.asResource("textures/misc/matrix_enchanting.png"); protected final Inventory playerInv; protected final MatrixEnchantingTableBlockEntity enchanter; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java index 9e6eeac57e..68793d0778 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/inventory/EnchantmentMatrix.java @@ -481,7 +481,7 @@ public void writeToNBT(CompoundTag cmp) { public void readFromNBT(CompoundTag cmp) { color = cmp.getInt(TAG_COLOR); type = cmp.getInt(TAG_TYPE); - enchant = BuiltInRegistries.ENCHANTMENT.get(new ResourceLocation(cmp.getString(TAG_ENCHANTMENT))); + enchant = BuiltInRegistries.ENCHANTMENT.get(ResourceLocation.parse(cmp.getString(TAG_ENCHANTMENT))); level = cmp.getInt(TAG_LEVEL); x = cmp.getInt(TAG_X); y = cmp.getInt(TAG_Y); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java index 3edbcbcf76..ef0a0603cf 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/BackpackModule.java @@ -113,7 +113,7 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - backpackBlockedTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "backpack_blocked")); + backpackBlockedTag = ItemTags.create(Quark.asResource("backpack_blocked")); } @PlayEvent @@ -193,7 +193,7 @@ public void clientSetup(ZClientSetup e) { e.enqueueWork(() -> { MenuScreens.register(menyType, BackpackInventoryScreen::new); - ItemProperties.register(backpack, new ResourceLocation("has_items"), + ItemProperties.register(backpack, Quark.asResource("has_items"), (stack, world, entity, i) -> (!BackpackModule.superOpMode && BackpackItem.doesBackpackHaveItems(stack)) ? 1 : 0); QuarkClient.ZETA_CLIENT.setHumanoidArmorModel(backpack.asItem(), (living, stack, slot, original) -> ModelHandler.armorModel(ModelHandler.backpack, slot)); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java index 3de4255c60..da5b845d9f 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/MagnetsModule.java @@ -70,7 +70,7 @@ public class MagnetsModule extends ZetaModule { @Config(description = "The maximum hardness of a block that a stonecutter pushed by magnets can cut through.") public static double stoneCutterMaxHardness = 3; - public static final TagKey> magneticEntities = TagKey.create(Registries.ENTITY_TYPE, Quark.asResource("affected_by_magnets")); + public static final TagKey> magneticEntities = Quark.asTagKey(Registries.ENTITY_TYPE,"affected_by_magnets"); @Hint public static Block magnet; diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java index f7eb944cab..cf2ee3bf7b 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/MatrixEnchantingModule.java @@ -223,7 +223,7 @@ private Influence parseEnchantmentList(String enchantmentList) { if(damp) enchStr = enchStr.substring(1); - Enchantment ench = BuiltInRegistries.ENCHANTMENT.get(new ResourceLocation(enchStr)); + Enchantment ench = BuiltInRegistries.ENCHANTMENT.get(ResourceLocation.parse(enchStr)); if(ench != null) { if(damp) dampen.add(ench); diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java index 4f204d6729..b50bca2dd0 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/PipesModule.java @@ -67,7 +67,7 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - pipesTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "pipes")); + pipesTag = BlockTags.create(Quark.asResource("pipes")); } @LoadEvent @@ -84,7 +84,7 @@ public final void clientSetup(ZClientSetup event) { @LoadEvent public void registerAdditionalModels(ZAddModels event) { - event.register(new ModelResourceLocation(Quark.MOD_ID, "extra/pipe_flare", "inventory")); + event.register(new ModelResourceLocation(Quark.asResource("extra/pipe_flare"), "inventory")); } } } diff --git a/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java b/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java index 9e4c299258..22cea718d6 100644 --- a/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java +++ b/src/main/java/org/violetmoon/quark/addons/oddities/module/TinyPotatoModule.java @@ -57,8 +57,8 @@ public final void register(ZRegister event) { public static class Client extends TinyPotatoModule { @LoadEvent public void modelBake(ZModel.ModifyBakingResult event) { - ResourceLocation tinyPotato = new ModelResourceLocation(new ResourceLocation("quark", "tiny_potato"), "inventory"); - Map map = event.getModels(); + ModelResourceLocation tinyPotato = ModelResourceLocation.inventory(Quark.asResource("tiny_potato")); + Map map = event.getModels(); BakedModel originalPotato = map.get(tinyPotato); map.put(tinyPotato, new TinyPotatoModel(originalPotato)); } @@ -84,7 +84,7 @@ private void registerTaters(ZAddModels event, String mod, Set usedNames, usedNames.add(path); path = path.substring("models/".length(), path.length() - ".json".length()); - event.register(new ResourceLocation("quark", path)); + event.register(Quark.asResource(path)); } } } diff --git a/src/main/java/org/violetmoon/quark/base/Quark.java b/src/main/java/org/violetmoon/quark/base/Quark.java index 1e904b3db7..53b0f4e9d1 100644 --- a/src/main/java/org/violetmoon/quark/base/Quark.java +++ b/src/main/java/org/violetmoon/quark/base/Quark.java @@ -3,7 +3,8 @@ import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.fml.common.Mod; +import net.minecraft.tags.TagKey; +import net.neoforged.fml.common.Mod; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.MixinEnvironment; @@ -57,11 +58,15 @@ public Quark() { MixinEnvironment.getCurrentEnvironment().audit(); } - public static ResourceLocation asResource(String name) { - return new ResourceLocation(MOD_ID, name); + public static ResourceLocation asResource(String path) { + return ResourceLocation.fromNamespaceAndPath(MOD_ID, path); } public static ResourceKey asResourceKey(ResourceKey> base, String name) { return ResourceKey.create(base, asResource(name)); } + + public static TagKey asTagKey(ResourceKey> base, String name) { + return TagKey.create(base, asResource(name)); + } } diff --git a/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java b/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java index 9c75527d57..487f3d63da 100644 --- a/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java +++ b/src/main/java/org/violetmoon/quark/base/capability/CapabilityHandler.java @@ -14,10 +14,10 @@ // TODO: push these event handlers into their respective modules public class CapabilityHandler { - private static final ResourceLocation DROPOFF_MANAGER = new ResourceLocation(Quark.MOD_ID, "dropoff"); - private static final ResourceLocation SORTING_HANDLER = new ResourceLocation(Quark.MOD_ID, "sort"); - private static final ResourceLocation MAGNET_TRACKER = new ResourceLocation(Quark.MOD_ID, "magnet_tracker"); - private static final ResourceLocation RUNE_COLOR_HANDLER = new ResourceLocation(Quark.MOD_ID, "rune_color"); + private static final ResourceLocation DROPOFF_MANAGER = Quark.asResource("dropoff"); + private static final ResourceLocation SORTING_HANDLER = Quark.asResource("sort"); + private static final ResourceLocation MAGNET_TRACKER = Quark.asResource("magnet_tracker"); + private static final ResourceLocation RUNE_COLOR_HANDLER = Quark.asResource("rune_color"); @PlayEvent public static void attachItemCapabilities(ZAttachCapabilities.ItemStackCaps event) { diff --git a/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java b/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java index 2b9920bbd5..8a93607c8f 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/QuarkConfigHomeScreen.java @@ -23,7 +23,7 @@ public class QuarkConfigHomeScreen extends ZetaConfigHomeScreen { - private static final CubeMap CUBE_MAP = new CubeMap(new ResourceLocation(Quark.MOD_ID, "textures/misc/panorama/panorama")); + private static final CubeMap CUBE_MAP = new CubeMap(Quark.asResource("textures/misc/panorama/panorama")); private static final PanoramaRenderer PANORAMA = new PanoramaRenderer(CUBE_MAP); private float time; diff --git a/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java b/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java index 4e17d60ca5..ed4b1466fb 100644 --- a/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java +++ b/src/main/java/org/violetmoon/quark/base/client/config/SocialButton.java @@ -16,7 +16,7 @@ public class SocialButton extends Button { - public static final ResourceLocation SOCIAL_ICONS = new ResourceLocation(Quark.MOD_ID, "textures/gui/social_icons.png"); + public static final ResourceLocation SOCIAL_ICONS = Quark.asResource("textures/gui/social_icons.png"); private final int textColor; private final int socialId; diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java b/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java index ac3a9d3eb4..e9934c64df 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java @@ -23,7 +23,7 @@ public class ClientUtil { - public static final ResourceLocation GENERAL_ICONS = new ResourceLocation(Quark.MOD_ID, "textures/gui/general_icons.png"); + public static final ResourceLocation GENERAL_ICONS = Quark.asResource("textures/gui/general_icons.png"); private static int progress; diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java b/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java index f094c74aa5..5a43824e1e 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/ModelHandler.java @@ -82,7 +82,7 @@ private static ModelLayerLocation addArmorModel(String name, Supplier computeBoatResources(boolean chest, EntityRendererProvider.Context context) { return WoodSetHandler.boatTypes().collect(ImmutableMap.toImmutableMap(Functions.identity(), name -> { String folder = chest ? "chest_boat" : "boat"; - ResourceLocation texture = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/" + folder + "/" + name + ".png"); + ResourceLocation texture = Quark.asResource("textures/model/entity/" + folder + "/" + name + ".png"); BoatModel model = (chest) ? new ChestBoatModel(context.bakeLayer(ModelHandler.quark_boat_chest)) : new BoatModel(context.bakeLayer(ModelHandler.quark_boat)); return new BoatModelTuple(texture, model); diff --git a/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java b/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java index 83479e5701..db3bd39776 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/ContributorRewardHandler.java @@ -133,7 +133,7 @@ public static void onRenderPlayer(ZRenderPlayer.Post event) { if(clientPlayer.isCapeLoaded()) { PlayerInfo info = clientPlayer.playerInfo; Map textures = info.textureLocations; - ResourceLocation loc = new ResourceLocation("quark", "textures/misc/dev_cape.png"); + ResourceLocation loc = Quark.asResource("textures/misc/dev_cape.png"); textures.put(MinecraftProfileTexture.Type.CAPE, loc); textures.put(MinecraftProfileTexture.Type.ELYTRA, loc); done.add(uuid); diff --git a/src/main/java/org/violetmoon/quark/base/handler/QuarkRemapHandler.java b/src/main/java/org/violetmoon/quark/base/handler/QuarkRemapHandler.java index f5d3a29610..2605c870bc 100644 --- a/src/main/java/org/violetmoon/quark/base/handler/QuarkRemapHandler.java +++ b/src/main/java/org/violetmoon/quark/base/handler/QuarkRemapHandler.java @@ -47,7 +47,7 @@ private static void remapAll(MissingMappingsEvent event, DefaultedRegistry excludedRecipes = new ArrayList<>(); for(JsonElement el : excluded) { - ResourceLocation loc = new ResourceLocation(el.getAsString()); + ResourceLocation loc = ResourceLocation.parse(el.getAsString()); if(!loc.equals(recipeId)) excludedRecipes.add(loc); } - RecipeSerializer serializer = BuiltInRegistries.RECIPE_SERIALIZER.get(new ResourceLocation(trueType)); + RecipeSerializer serializer = BuiltInRegistries.RECIPE_SERIALIZER.get(ResourceLocation.parse(trueType)); if(serializer == null) throw new JsonSyntaxException("Invalid or unsupported recipe type '" + trueType + "'"); Recipe parent = serializer.fromJson(recipeId, json); @@ -179,13 +179,13 @@ public ExclusionRecipe fromNetwork(@NotNull ResourceLocation recipeId, @NotNull int exclusions = buffer.readVarInt(); List excludedRecipes = new ArrayList<>(); for(int i = 0; i < exclusions; i++) { - ResourceLocation loc = new ResourceLocation(buffer.readUtf(32767)); + ResourceLocation loc = ResourceLocation.parse(buffer.readUtf(32767)); if(!loc.equals(recipeId)) excludedRecipes.add(loc); } String trueType = buffer.readUtf(32767); - RecipeSerializer serializer = BuiltInRegistries.RECIPE_SERIALIZER.get(new ResourceLocation(trueType)); + RecipeSerializer serializer = BuiltInRegistries.RECIPE_SERIALIZER.get(ResourceLocation.parse(trueType)); if(serializer == null) throw new IllegalArgumentException("Invalid or unsupported recipe type '" + trueType + "'"); Recipe parent = serializer.fromNetwork(recipeId, buffer); diff --git a/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java b/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java index 35ee7ce59b..ea9a843c8e 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/automation/client/render/QuarkPistonBlockEntityRenderer.java @@ -38,7 +38,7 @@ public static boolean renderPistonBlock(PistonMovingBlockEntity piston, float pa if(tile == null) return false; CompoundTag tileTag = PistonsMoveTileEntitiesModule.getMovingBlockEntityData(piston.getLevel(), truePos); - if(tileTag != null && tile.getType() == BuiltInRegistries.BLOCK_ENTITY_TYPE.get(new ResourceLocation(tileTag.getString("id")))) + if(tileTag != null && tile.getType() == BuiltInRegistries.BLOCK_ENTITY_TYPE.get(ResourceLocation.parse(tileTag.getString("id")))) tile.load(tileTag); Vec3 offset = new Vec3(piston.getXOff(partialTicks), piston.getYOff(partialTicks), piston.getZOff(partialTicks)); return renderTESafely(piston.getLevel(), truePos, state, tile, piston, partialTicks, offset, matrix, bufferIn, combinedLightIn, combinedOverlayIn); diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java index 1b41246b98..280450021b 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/FeedingTroughModule.java @@ -59,7 +59,7 @@ public class FeedingTroughModule extends ZetaModule { //using a ResourceKey because they're interned, and Holder.Reference#is leverages this for a very efficient implementation - private static final ResourceKey FEEDING_TROUGH_POI_KEY = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, Quark.asResource("feeding_trough")); + private static final ResourceKey FEEDING_TROUGH_POI_KEY = Quark.asResourceKey(Registries.POINT_OF_INTEREST_TYPE, "feeding_trough"); private static final Set FREE_FAKE_PLAYERS = new HashSet<>(); //fake players created are either stored here above or in the cache below. //this way each animal has its own player which is needed as they are moved in diff pos diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java index a4731782fd..ccd32cf9a2 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/IronRodModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.automation.module; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; @@ -33,6 +34,6 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - ironRodImmuneTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "iron_rod_immune")); + ironRodImmuneTag = Quark.asTagKey(Registries.BLOCK,"iron_rod_immune")); } } diff --git a/src/main/java/org/violetmoon/quark/content/automation/module/PistonsMoveTileEntitiesModule.java b/src/main/java/org/violetmoon/quark/content/automation/module/PistonsMoveTileEntitiesModule.java index 6480876116..930fea89da 100644 --- a/src/main/java/org/violetmoon/quark/content/automation/module/PistonsMoveTileEntitiesModule.java +++ b/src/main/java/org/violetmoon/quark/content/automation/module/PistonsMoveTileEntitiesModule.java @@ -299,7 +299,7 @@ private static BlockEntity loadBlockEntitySafe(Level level, BlockPos pos, Compou if(inWorldEntity == null) { Quark.LOG.warn("No block entity found at {} (expected {})", pos.toShortString(), expectedTypeStr); return null; - } else if(inWorldEntity.getType() != BuiltInRegistries.BLOCK_ENTITY_TYPE.get(new ResourceLocation(expectedTypeStr))) { + } else if(inWorldEntity.getType() != BuiltInRegistries.BLOCK_ENTITY_TYPE.get(ResourceLocation.parse(expectedTypeStr))) { Quark.LOG.warn("Wrong block entity found at {} (expected {}, got {})", pos.toShortString(), expectedTypeStr, BlockEntityType.getKey(inWorldEntity.getType())); return null; } else { diff --git a/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java b/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java index ae6bf73107..a143f1909b 100644 --- a/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/building/client/render/be/VariantChestRenderer.java @@ -45,7 +45,7 @@ public Material getMaterial(ChestBlockEntity tile, ChestType type) { else tex.append(choose(type, "normal", "left", "right")); - return new Material(Sheets.CHEST_SHEET, new ResourceLocation(Quark.MOD_ID, tex.toString())); + return new Material(Sheets.CHEST_SHEET, Quark.asResource(tex.toString())); }); } diff --git a/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java b/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java index aa3cb6eebf..9132aaa32f 100644 --- a/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/building/client/render/entity/GlassItemFrameRenderer.java @@ -56,7 +56,7 @@ public class GlassItemFrameRenderer extends EntityRenderer { - private static final ModelResourceLocation LOCATION_MODEL = new ModelResourceLocation(new ResourceLocation(Quark.MOD_ID, "extra/glass_item_frame"), "inventory"); + private static final ModelResourceLocation LOCATION_MODEL = new ModelResourceLocation(Quark.asResource("extra/glass_item_frame"), "inventory"); private static final List SIGN_DIRECTIONS = List.of(Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST); diff --git a/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java b/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java index 69341b9816..8eb9b0f7c1 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/HedgesModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; @@ -46,7 +47,7 @@ public void postRegister(ZRegister.Post e) { @LoadEvent public final void setup(ZCommonSetup event) { - hedgesTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "hedges")); + hedgesTag = Quark.asTagKey(Registries.BLOCK,"hedges"); } @ZetaLoadModule(clientReplacement = true) diff --git a/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java index 2049d799f6..06f5e7da87 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/HollowLogsModule.java @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.Map; +import net.minecraft.core.registries.Registries; import org.violetmoon.quark.api.ICrawlSpaceBlock; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.HollowLogBlock; @@ -64,7 +65,7 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - hollowLogsTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "hollow_logs")); + hollowLogsTag = Quark.asTagKey(Registries.BLOCK, "hollow_logs"); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java index 5fddf3b788..18538acbd4 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; @@ -35,7 +36,7 @@ public static boolean isCorundum() { @LoadEvent public final void setup(ZCommonSetup event) { - lampTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "crystal_lamp")); + lampTag = Quark.asTagKey(Registries.BLOCK,"crystal_lamp"); } @LoadEvent diff --git a/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java index cbbe7120bc..d2d8b61e2d 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/StoolsModule.java @@ -68,7 +68,7 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - stoolsTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "stools")); + stoolsTag = Quark.asTagKey(Registries.ITEM, "stools"); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java index e7b1a4c69c..ef888b2abb 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VariantChestsModule.java @@ -135,11 +135,11 @@ private void makeChestBlocks(ZetaModule module, String name, Block base, @Nullab VariantChestBlock regularChest = new VariantChestBlock(name, module, () -> chestTEType, props).setCondition(condition); regularChests.add(regularChest); - chestMappings.put(TagKey.create(Registries.STRUCTURE, new ResourceLocation(Quark.MOD_ID, name + "_chest_structures")), regularChest); + chestMappings.put(Quark.asTagKey(Registries.STRUCTURE, name + "_chest_structures"), regularChest); VariantTrappedChestBlock trappedChest = new VariantTrappedChestBlock(name, module, () -> trappedChestTEType, props).setCondition(condition); trappedChests.add(trappedChest); - trappedChestMappings.put(TagKey.create(Registries.STRUCTURE, new ResourceLocation(Quark.MOD_ID, name + "_chest_structures")), trappedChest); + trappedChestMappings.put(Quark.asTagKey(Registries.STRUCTURE, name + "_chest_structures"), trappedChest); Quark.LOOTR_INTEGRATION.makeChestBlocks(module, name, base, condition, regularChest, trappedChest); } @@ -177,12 +177,12 @@ public final void configChanged(ZConfigChanged event) { String left = toks[0]; String right = toks[1]; - Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(right)); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(right)); if(block != Blocks.AIR) { - manualChestMappings.put(new ResourceLocation(left), block); + manualChestMappings.put(ResourceLocation.parse(left), block); if(regularChests.contains(block)) { var trapped = trappedChests.get(regularChests.indexOf(block)); - manualTrappedChestMappings.put(new ResourceLocation(left), trapped); + manualTrappedChestMappings.put(ResourceLocation.parse(left), trapped); } } } diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java index 913c05052a..f5db34effc 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Optional; +import net.minecraft.core.registries.Registries; import org.apache.commons.lang3.tuple.Pair; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.QuarkVerticalSlabBlock; @@ -110,7 +111,7 @@ public void postRegister(ZRegister.Post e) { @LoadEvent public final void setup(ZCommonSetup event) { - verticalSlabTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "vertical_slabs")); + verticalSlabTag = Quark.asTagKey(Registries.BLOCK,"vertical_slabs"); } @LoadEvent diff --git a/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java index 39ebe0e696..57f4799d68 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.building.module; +import net.minecraft.core.registries.Registries; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.WoodPostBlock; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -42,7 +43,7 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - postsTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "posts")); + postsTag = Quark.asTagKey(Registries.ITEM,"posts"); } public static boolean canHangingBlockConnect(BlockState state, LevelReader worldIn, BlockPos pos, boolean prev) { diff --git a/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java b/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java index b0890e7619..944d9bf313 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/BucketsShowInhabitantsModule.java @@ -53,17 +53,17 @@ public static class Client extends BucketsShowInhabitantsModule { @LoadEvent public void clientSetup(ZClientSetup e) { e.enqueueWork(() -> { - ItemProperties.register(Items.AXOLOTL_BUCKET, new ResourceLocation(Quark.MOD_ID, "variant"), + ItemProperties.register(Items.AXOLOTL_BUCKET, Quark.asResource("variant"), new MobBucketVariantProperty(Axolotl.Variant.values().length, () -> showAxolotls)); - ItemProperties.register(CrabsModule.crab_bucket, new ResourceLocation(Quark.MOD_ID, "variant"), + ItemProperties.register(CrabsModule.crab_bucket, Quark.asResource("variant"), new MobBucketVariantProperty(Crab.COLORS, () -> showCrabs)); - ItemProperties.register(SlimeInABucketModule.slime_in_a_bucket, new ResourceLocation(Quark.MOD_ID, "shiny"), + ItemProperties.register(SlimeInABucketModule.slime_in_a_bucket, Quark.asResource("shiny"), new ShinyMobBucketProperty(() -> showShinySlime && VariantAnimalTexturesModule.staticEnabled && VariantAnimalTexturesModule.enableShinySlime)); - ItemProperties.register(Items.TROPICAL_FISH_BUCKET, new ResourceLocation(Quark.MOD_ID, "base"), + ItemProperties.register(Items.TROPICAL_FISH_BUCKET, Quark.asResource("base"), new TropicalFishBucketVariantProperty((b) -> TropicalFish.getBaseColor(b).getId(), () -> showTropicalFish)); - ItemProperties.register(Items.TROPICAL_FISH_BUCKET, new ResourceLocation(Quark.MOD_ID, "pattern"), + ItemProperties.register(Items.TROPICAL_FISH_BUCKET, Quark.asResource("pattern"), new TropicalFishBucketVariantProperty((p) -> TropicalFish.getPattern(p).getPackedId(), () -> showTropicalFish)); }); } diff --git a/src/main/java/org/violetmoon/quark/content/client/module/CameraModule.java b/src/main/java/org/violetmoon/quark/content/client/module/CameraModule.java index 294746f446..0d8072e3eb 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/CameraModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/CameraModule.java @@ -70,35 +70,35 @@ public static class Client extends CameraModule { private static final ResourceLocation[] SHADERS = new ResourceLocation[] { null, - new ResourceLocation(Quark.MOD_ID, "shaders/post/grayscale.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/sepia.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/desaturate.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/oversaturate.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/cool.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/warm.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/conjugate.json"), - - new ResourceLocation(Quark.MOD_ID, "shaders/post/redfocus.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/greenfocus.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/bluefocus.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/yellowfocus.json"), - - new ResourceLocation("shaders/post/bumpy.json"), - new ResourceLocation("shaders/post/notch.json"), - new ResourceLocation("shaders/post/creeper.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/enderman.json"), - - new ResourceLocation(Quark.MOD_ID, "shaders/post/bits.json"), - new ResourceLocation("shaders/post/blobs.json"), - new ResourceLocation("shaders/post/pencil.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/watercolor.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/monochrome.json"), - new ResourceLocation("shaders/post/sobel.json"), - - new ResourceLocation(Quark.MOD_ID, "shaders/post/colorblind/deuteranopia.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/colorblind/protanopia.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/colorblind/tritanopia.json"), - new ResourceLocation(Quark.MOD_ID, "shaders/post/colorblind/achromatopsia.json") + Quark.asResource("shaders/post/grayscale.json"), + Quark.asResource("shaders/post/sepia.json"), + Quark.asResource("shaders/post/desaturate.json"), + Quark.asResource("shaders/post/oversaturate.json"), + Quark.asResource("shaders/post/cool.json"), + Quark.asResource("shaders/post/warm.json"), + Quark.asResource("shaders/post/conjugate.json"), + + Quark.asResource("shaders/post/redfocus.json"), + Quark.asResource("shaders/post/greenfocus.json"), + Quark.asResource("shaders/post/bluefocus.json"), + Quark.asResource("shaders/post/yellowfocus.json"), + + ResourceLocation.withDefaultNamespace("shaders/post/bumpy.json"), //TODO this seems to not exist anymore + ResourceLocation.withDefaultNamespace("shaders/post/notch.json"), + ResourceLocation.withDefaultNamespace("shaders/post/creeper.json"), + Quark.asResource("shaders/post/enderman.json"), + + Quark.asResource("shaders/post/bits.json"), + ResourceLocation.withDefaultNamespace("shaders/post/blobs.json"), + ResourceLocation.withDefaultNamespace("shaders/post/pencil.json"), + Quark.asResource("shaders/post/watercolor.json"), + Quark.asResource("shaders/post/monochrome.json"), + ResourceLocation.withDefaultNamespace("shaders/post/sobel.json"), + + Quark.asResource("shaders/post/colorblind/deuteranopia.json"), + Quark.asResource("shaders/post/colorblind/protanopia.json"), + Quark.asResource("shaders/post/colorblind/tritanopia.json"), + Quark.asResource("shaders/post/colorblind/achromatopsia.json") }; private static KeyMapping cameraModeKey; @@ -376,7 +376,7 @@ else if(mc.getCurrentServer() != null) text = I18n.get("quark.camera.info", Component.keybind("quark.keybind.camera_mode").getString()); guiGraphics.drawString(mc.font, text, (float) (twidth / 2 - mc.font.width(text) / 2), 16, 0xFFFFFF, true); - ResourceLocation CAMERA_TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/misc/camera.png"); + ResourceLocation CAMERA_TEXTURE = Quark.asResource("textures/misc/camera.png"); RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); guiGraphics.blit(CAMERA_TEXTURE, left - 22, top + 18, 0, 0, 0, 16, 16, 16, 16); diff --git a/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java b/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java index f5621a0aa0..516072824c 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/GreenerGrassModule.java @@ -129,7 +129,7 @@ private void registerGreenerColor(Iterable ids, BooleanSupplier conditio BlockColors colors = Minecraft.getInstance().getBlockColors(); for(String id : ids) { - Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(id)); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(id)); if(block == Blocks.AIR) continue; diff --git a/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java b/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java index e5137526f1..204a8bc9a4 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/UsesForCursesModule.java @@ -25,7 +25,7 @@ @ZetaLoadModule(category = "client") public class UsesForCursesModule extends ZetaModule { - private static final ResourceLocation PUMPKIN_OVERLAY = new ResourceLocation("textures/misc/pumpkinblur.png"); + private static final ResourceLocation PUMPKIN_OVERLAY = ResourceLocation.withDefaultNamespace("textures/misc/pumpkinblur.png"); public static boolean staticEnabled; diff --git a/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java b/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java index 72a1896b42..3a6c768870 100644 --- a/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java +++ b/src/main/java/org/violetmoon/quark/content/client/module/VariantAnimalTexturesModule.java @@ -83,9 +83,9 @@ public final void clientSetup(ZClientSetup event) { textures = Multimaps.newListMultimap(new EnumMap<>(VariantTextureType.class), ArrayList::new); shinyTextures = new HashMap<>(); - registerTextures(VariantTextureType.COW, COW_COUNT, new ResourceLocation("textures/entity/cow/cow.png")); - registerTextures(VariantTextureType.PIG, PIG_COUNT, new ResourceLocation("textures/entity/pig/pig.png")); - registerTextures(VariantTextureType.CHICKEN, CHICKEN_COUNT, new ResourceLocation("textures/entity/chicken.png")); + registerTextures(VariantTextureType.COW, COW_COUNT, ResourceLocation.withDefaultNamespace("textures/entity/cow/cow.png")); + registerTextures(VariantTextureType.PIG, PIG_COUNT, ResourceLocation.withDefaultNamespace("textures/entity/pig/pig.png")); + registerTextures(VariantTextureType.CHICKEN, CHICKEN_COUNT, ResourceLocation.withDefaultNamespace("textures/entity/chicken.png")); registerShiny(VariantTextureType.RABBIT); registerShiny(VariantTextureType.LLAMA); registerShiny(VariantTextureType.DOLPHIN); @@ -205,7 +205,7 @@ else if(nectar) type = "nectar"; String path = String.format("textures/model/entity/variants/bees/%s/%s.png", name, type); - return new ResourceLocation(Quark.MOD_ID, path); + return Quark.asResource(path); } } @@ -253,7 +253,7 @@ private static ResourceLocation getRandomTexture(Entity e, VariantTextureType ty private static void registerTextures(VariantTextureType type, int count, ResourceLocation vanilla) { String name = type.name().toLowerCase(Locale.ROOT); for(int i = 1; i < count + 1; i++) - textures.put(type, new ResourceLocation(Quark.MOD_ID, String.format("textures/model/entity/variants/%s%d.png", name, i))); + textures.put(type, Quark.asResource(String.format("textures/model/entity/variants/%s%d.png", name, i))); if(vanilla != null) textures.put(type, vanilla); @@ -261,7 +261,7 @@ private static void registerTextures(VariantTextureType type, int count, Resourc } private static void registerShiny(VariantTextureType type) { - shinyTextures.put(type, new ResourceLocation(Quark.MOD_ID, String.format("textures/model/entity/variants/%s_shiny.png", type.name().toLowerCase(Locale.ROOT)))); + shinyTextures.put(type, Quark.asResource(String.format("textures/model/entity/variants/%s_shiny.png", type.name().toLowerCase(Locale.ROOT)))); } } diff --git a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java index 615dc04e15..22cb922136 100644 --- a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java +++ b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeIconEntry.java @@ -49,8 +49,8 @@ public AttributeIconEntry deserialize(JsonElement json, Type typeOfT, JsonDeseri } String texturePath = GsonHelper.getAsString(obj, "texture"); - ResourceLocation truncatedPath = new ResourceLocation(texturePath); - ResourceLocation texture = new ResourceLocation(truncatedPath.getNamespace(), "textures/" + truncatedPath.getPath() + ".png"); + ResourceLocation truncatedPath = ResourceLocation.parse(texturePath); + ResourceLocation texture = ResourceLocation.fromNamespaceAndPath(truncatedPath.getNamespace(), "textures/" + truncatedPath.getPath() + ".png"); String compareStr = GsonHelper.getAsString(obj, "compare", "no_compare"); CompareType type = CompareType.valueOf(compareStr.toUpperCase()); diff --git a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java index f47ebebef9..f431220337 100644 --- a/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java +++ b/src/main/java/org/violetmoon/quark/content/client/resources/AttributeTooltipManager.java @@ -39,7 +39,7 @@ protected Map prepare(@NotNull ResourceManager manag Map tooltips = new HashMap<>(); profiler.startTick(); try { - for(Resource resource : manager.getResourceStack(new ResourceLocation("quark", "attribute_tooltips.json"))) { + for(Resource resource : manager.getResourceStack(Quark.asResource("attribute_tooltips.json"))) { profiler.push(resource.sourcePackId()); try { diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java index fa8d2e36b1..7fba3a15b0 100644 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java @@ -67,15 +67,15 @@ */ public class AttributeTooltips { - public static final ResourceLocation TEXTURE_UPGRADE = new ResourceLocation(Quark.MOD_ID, "textures/attribute/upgrade.png"); - public static final ResourceLocation TEXTURE_DOWNGRADE = new ResourceLocation(Quark.MOD_ID, "textures/attribute/downgrade.png"); + public static final ResourceLocation TEXTURE_UPGRADE = Quark.asResource("textures/attribute/upgrade.png"); + public static final ResourceLocation TEXTURE_DOWNGRADE = Quark.asResource("textures/attribute/downgrade.png"); private static final Map attributes = new HashMap<>(); public static void receiveAttributes(Map map) { attributes.clear(); for(Map.Entry entry : map.entrySet()) { - attributes.put(new ResourceLocation(entry.getKey()), entry.getValue()); + attributes.put(ResourceLocation.parse(entry.getKey()), entry.getValue()); } } diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java index 6c293a809d..cd22130185 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/EnchantedBookTooltips.java @@ -160,10 +160,10 @@ private static void computeAdditionalStacks() { String left = tokens[0]; String right = tokens[1]; - BuiltInRegistries.ENCHANTMENT.getOptional(new ResourceLocation(left)) + BuiltInRegistries.ENCHANTMENT.getOptional(ResourceLocation.parse(left)) .ifPresent(ench -> { for(String itemId : right.split(",")) { - BuiltInRegistries.ITEM.getOptional(new ResourceLocation(itemId)).ifPresent(item -> additionalStacks.put(ench, new ItemStack(item))); + BuiltInRegistries.ITEM.getOptional(ResourceLocation.parse(itemId)).ifPresent(item -> additionalStacks.put(ench, new ItemStack(item))); } }); } diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java index 4e29879fbb..352f3a2009 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/MapTooltips.java @@ -30,7 +30,7 @@ public class MapTooltips { - private static final ResourceLocation RES_MAP_BACKGROUND = new ResourceLocation("textures/map/map_background.png"); + private static final ResourceLocation RES_MAP_BACKGROUND = ResourceLocation.withDefaultNamespace("textures/map/map_background.png"); public static void makeTooltip(ZGatherTooltipComponents event) { ItemStack stack = event.getItemStack(); diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java index e7a495cb4d..3dfb4654ec 100755 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/ShulkerBoxTooltips.java @@ -41,7 +41,7 @@ public class ShulkerBoxTooltips { - public static final ResourceLocation WIDGET_RESOURCE = new ResourceLocation("quark", "textures/misc/shulker_widget.png"); + public static final ResourceLocation WIDGET_RESOURCE = Quark.asResource("textures/misc/shulker_widget.png"); public static void makeTooltip(ZGatherTooltipComponents event) { ItemStack stack = event.getItemStack(); diff --git a/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java b/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java index 49db0a8961..c68d40489e 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/config/VariantsConfig.java @@ -96,8 +96,8 @@ public void onReload(ZetaModule module, ConfigFlagManager flagManager) { for(String s : manualVariants) { String[] toks = s.split(","); - Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(toks[1])); - Block out = BuiltInRegistries.BLOCK.get(new ResourceLocation(toks[2])); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(toks[1])); + Block out = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(toks[2])); manualVariantMap.put(block, new ManualVariant(toks[0], out)); } @@ -243,7 +243,7 @@ private Block getSuffixedBlock(String namespace, String name, String suffix, Str } String targetStr = String.format(format, namespace, name, suffix); - ResourceLocation target = new ResourceLocation(targetStr); + ResourceLocation target = ResourceLocation.parse(targetStr); Block ret = BuiltInRegistries.BLOCK.get(target); if(ret == Blocks.AIR) { diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java index ceaffad389..924f9fe789 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentPredicatesModule.java @@ -48,7 +48,7 @@ public void clientSetup(ZClientSetup e) { for(Enchantment enchant : enchants) { ResourceLocation enchantRes = BuiltInRegistries.ENCHANTMENT.getKey(enchant); - ResourceLocation name = new ResourceLocation(Quark.MOD_ID + "_has_enchant_" + enchantRes.getNamespace() + "_" + enchantRes.getPath()); + ResourceLocation name = ResourceLocation.parse(Quark.MOD_ID + "_has_enchant_" + enchantRes.getNamespace() + "_" + enchantRes.getPath()); ItemPropertyFunction fun = (stack, level, entity, i) -> EnchantmentHelper.getTagEnchantmentLevel(enchant, stack); for(Item item : items) diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java index 071c37feaa..9a02f9fe17 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/EnchantmentsBegoneModule.java @@ -41,7 +41,7 @@ public final void configChanged(ZConfigChanged event) { enchantments.clear(); for(String enchantKey : enchantmentsToBegone) { - Enchantment enchantment = BuiltInRegistries.ENCHANTMENT.get(new ResourceLocation(enchantKey)); + Enchantment enchantment = BuiltInRegistries.ENCHANTMENT.get(ResourceLocation.parse(enchantKey)); if(enchantment != null) enchantments.add(enchantment); } diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java index bac507dc55..fd824338b5 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/VariantSelectorModule.java @@ -418,7 +418,7 @@ public void onRender(ZRenderGuiOverlay.Crosshair.Pre event) { posX += width * 2; } else { - final ResourceLocation WIDGETS_LOCATION = new ResourceLocation("textures/gui/widget.png"); + final ResourceLocation WIDGETS_LOCATION = ResourceLocation.withDefaultNamespace("textures/gui/widget.png"); //TODO this file no longer exists if(alignHudToHotbar) { RenderSystem.enableBlend(); diff --git a/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java b/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java index 1d39fca627..3c51815d16 100644 --- a/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java +++ b/src/main/java/org/violetmoon/quark/content/management/client/screen/HeldShulkerBoxScreen.java @@ -24,7 +24,7 @@ public class HeldShulkerBoxScreen extends AbstractContainerScreen implements IQuarkButtonAllowed { - private static final ResourceLocation CONTAINER_TEXTURE = new ResourceLocation("textures/gui/container/shulker_box.png"); + private static final ResourceLocation CONTAINER_TEXTURE = ResourceLocation.withDefaultNamespace("textures/gui/container/shulker_box.png"); public HeldShulkerBoxScreen(HeldShulkerBoxMenu p_99240_, Inventory p_99241_, Component p_99242_) { super(p_99240_, p_99241_, p_99242_); diff --git a/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java b/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java index 779be3d65e..4277493907 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/HotbarChangerModule.java @@ -32,7 +32,7 @@ @ZetaLoadModule(category = "management") public class HotbarChangerModule extends ZetaModule { - private static final ResourceLocation WIDGETS = new ResourceLocation("textures/gui/widgets.png"); + private static final ResourceLocation WIDGETS = ResourceLocation.withDefaultNamespace("textures/gui/widgets.png"); //TODO this file no longer exists private static final int MAX_HEIGHT = 90; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java index 1f0c2cd416..1ef9758176 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/CrabMoldLayer.java @@ -15,7 +15,7 @@ public class CrabMoldLayer extends RenderLayer { - private static final ResourceLocation MOLD_LAYER = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/crab/mold_layer.png"); + private static final ResourceLocation MOLD_LAYER = Quark.asResource("textures/model/entity/crab/mold_layer.png"); public CrabMoldLayer(RenderLayerParent renderer) { super(renderer); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java index c7b7f69a66..fe808650a2 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/FoxhoundCollarLayer.java @@ -25,7 +25,7 @@ public class FoxhoundCollarLayer extends RenderLayer { - private static final ResourceLocation WOLF_COLLAR = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/collar.png"); + private static final ResourceLocation WOLF_COLLAR = Quark.asResource("textures/model/entity/foxhound/collar.png"); public FoxhoundCollarLayer(RenderLayerParent renderer) { super(renderer); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java index 186004de5f..7f035ff858 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/StonelingLichenLayer.java @@ -15,7 +15,7 @@ public class StonelingLichenLayer extends RenderLayer { - private static final ResourceLocation MOLD_LAYER = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/stoneling/lichen_layer.png"); + private static final ResourceLocation MOLD_LAYER = Quark.asResource("textures/model/entity/stoneling/lichen_layer.png"); public StonelingLichenLayer(RenderLayerParent renderer) { super(renderer); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java index c19e672e3c..6363db692b 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/ToretoiseOreLayer.java @@ -25,7 +25,7 @@ public ToretoiseOreLayer(RenderLayerParent renderer) public void render(@NotNull PoseStack matrix, @NotNull MultiBufferSource buffer, int light, Toretoise entity, float limbAngle, float limbDistance, float tickDelta, float customAngle, float headYaw, float headPitch) { int ore = entity.getOreType(); if(ore != 0 && ore <= Toretoise.ORE_TYPES) { - ResourceLocation res = new ResourceLocation(String.format(ORE_BASE, ore)); + ResourceLocation res = ResourceLocation.parse(String.format(ORE_BASE, ore)); renderColoredCutoutModel(getParentModel(), res, matrix, buffer, light, entity, 1, 1, 1); } } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java index fb109d1bfc..1652d2e6e1 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenClothingLayer.java @@ -19,7 +19,7 @@ public class ForgottenClothingLayer> extends RenderLayer { - private static final ResourceLocation TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/forgotten/overlay.png"); + private static final ResourceLocation TEXTURE = Quark.asResource("textures/model/entity/forgotten/overlay.png"); private final SkeletonModel layerModel; public ForgottenClothingLayer(RenderLayerParent parent, EntityModelSet model) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java index d72df12ea1..e530dfbc6d 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/forgotten/ForgottenEyesLayer.java @@ -13,7 +13,7 @@ public class ForgottenEyesLayer> extends EyesLayer { - private static final ResourceLocation TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/forgotten/eye.png"); + private static final ResourceLocation TEXTURE = Quark.asResource("textures/model/entity/forgotten/eye.png"); private static final RenderType RENDER_TYPE = RenderType.eyes(TEXTURE); public ForgottenEyesLayer(RenderLayerParent rendererIn) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java index f32ccd69f9..ce49c79e56 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaCollarLayer.java @@ -25,7 +25,7 @@ public class ShibaCollarLayer extends RenderLayer { - private static final ResourceLocation WOLF_COLLAR = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/collar.png"); + private static final ResourceLocation WOLF_COLLAR = Quark.asResource("textures/model/entity/shiba/collar.png"); public ShibaCollarLayer(RenderLayerParent renderer) { super(renderer); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java index a3885ec68f..497fc5bdad 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/CrabRenderer.java @@ -6,6 +6,7 @@ import org.jetbrains.annotations.NotNull; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.layer.CrabMoldLayer; import org.violetmoon.quark.content.mobs.client.model.CrabModel; @@ -14,9 +15,9 @@ public class CrabRenderer extends MobRenderer { private static final ResourceLocation[] TEXTURES = new ResourceLocation[] { - new ResourceLocation("quark", "textures/model/entity/crab/red.png"), - new ResourceLocation("quark", "textures/model/entity/crab/blue.png"), - new ResourceLocation("quark", "textures/model/entity/crab/green.png") + Quark.asResource("textures/model/entity/crab/red.png"), + Quark.asResource("textures/model/entity/crab/blue.png"), + Quark.asResource("textures/model/entity/crab/green.png") }; public CrabRenderer(EntityRendererProvider.Context context) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java index d70585b338..93a82ce3fc 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ForgottenRenderer.java @@ -16,7 +16,7 @@ public class ForgottenRenderer extends SkeletonRenderer { - private static final ResourceLocation TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/forgotten/main.png"); + private static final ResourceLocation TEXTURE = Quark.asResource("textures/model/entity/forgotten/main.png"); @SuppressWarnings({ "rawtypes", "unchecked" }) public ForgottenRenderer(EntityRendererProvider.Context context) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java index cb7669bc8a..c49442d8a8 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/FoxhoundRenderer.java @@ -26,17 +26,17 @@ public class FoxhoundRenderer extends MobRenderer { - private static final ResourceLocation FOXHOUND_IDLE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/red/idle.png"); - private static final ResourceLocation FOXHOUND_HOSTILE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/red/hostile.png"); - private static final ResourceLocation FOXHOUND_SLEEPING = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/red/sleeping.png"); + private static final ResourceLocation FOXHOUND_IDLE = Quark.asResource("textures/model/entity/foxhound/red/idle.png"); + private static final ResourceLocation FOXHOUND_HOSTILE = Quark.asResource("textures/model/entity/foxhound/red/hostile.png"); + private static final ResourceLocation FOXHOUND_SLEEPING = Quark.asResource("textures/model/entity/foxhound/red/sleeping.png"); - private static final ResourceLocation SOULHOUND_IDLE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/blue/idle.png"); - private static final ResourceLocation SOULHOUND_HOSTILE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/blue/hostile.png"); - private static final ResourceLocation SOULHOUND_SLEEPING = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/blue/sleeping.png"); + private static final ResourceLocation SOULHOUND_IDLE = Quark.asResource("textures/model/entity/foxhound/blue/idle.png"); + private static final ResourceLocation SOULHOUND_HOSTILE = Quark.asResource("textures/model/entity/foxhound/blue/hostile.png"); + private static final ResourceLocation SOULHOUND_SLEEPING = Quark.asResource("textures/model/entity/foxhound/blue/sleeping.png"); - private static final ResourceLocation BASALT_FOXHOUND_IDLE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/black/idle.png"); - private static final ResourceLocation BASALT_FOXHOUND_HOSTILE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/black/hostile.png"); - private static final ResourceLocation BASALT_FOXHOUND_SLEEPING = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/foxhound/black/sleeping.png"); + private static final ResourceLocation BASALT_FOXHOUND_IDLE = Quark.asResource("textures/model/entity/foxhound/black/idle.png"); + private static final ResourceLocation BASALT_FOXHOUND_HOSTILE = Quark.asResource("textures/model/entity/foxhound/black/hostile.png"); + private static final ResourceLocation BASALT_FOXHOUND_SLEEPING = Quark.asResource("textures/model/entity/foxhound/black/sleeping.png"); private static final int SHINY_CHANCE = 256; diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java index 3e30665baa..aaf6cd5bac 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ShibaRenderer.java @@ -16,13 +16,13 @@ public class ShibaRenderer extends MobRenderer { private static final ResourceLocation[] SHIBA_BASES = { - new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/shiba0.png"), - new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/shiba1.png"), - new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/shiba2.png") + Quark.asResource("textures/model/entity/shiba/shiba0.png"), + Quark.asResource("textures/model/entity/shiba/shiba1.png"), + Quark.asResource("textures/model/entity/shiba/shiba2.png") }; - private static final ResourceLocation SHIBA_RARE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/shiba_rare.png"); - private static final ResourceLocation SHIBA_DOGE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/shiba/shiba_doge.png"); + private static final ResourceLocation SHIBA_RARE = Quark.asResource("textures/model/entity/shiba/shiba_rare.png"); + private static final ResourceLocation SHIBA_DOGE = Quark.asResource("textures/model/entity/shiba/shiba_doge.png"); public ShibaRenderer(EntityRendererProvider.Context context) { super(context, ModelHandler.model(ModelHandler.shiba), 0.5F); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java index bd4132cf2e..8a95d1bed3 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/ToretoiseRenderer.java @@ -14,7 +14,7 @@ public class ToretoiseRenderer extends MobRenderer { - private static final ResourceLocation BASE_TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/toretoise/base.png"); + private static final ResourceLocation BASE_TEXTURE = Quark.asResource("textures/model/entity/toretoise/base.png"); public ToretoiseRenderer(EntityRendererProvider.Context context) { super(context, ModelHandler.model(ModelHandler.toretoise), 1F); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java index 3bcbc31be4..abd025f868 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/client/render/entity/WraithRenderer.java @@ -6,13 +6,14 @@ import org.jetbrains.annotations.NotNull; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.client.handler.ModelHandler; import org.violetmoon.quark.content.mobs.client.model.WraithModel; import org.violetmoon.quark.content.mobs.entity.Wraith; public class WraithRenderer extends MobRenderer { - private static final ResourceLocation TEXTURE = new ResourceLocation("quark", "textures/model/entity/wraith.png"); + private static final ResourceLocation TEXTURE = Quark.asResource("textures/model/entity/wraith.png"); public WraithRenderer(EntityRendererProvider.Context context) { super(context, ModelHandler.model(ModelHandler.wraith), 0F); diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java index 40b5a88962..8a04ad4c7e 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java @@ -12,6 +12,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.Packet; @@ -19,6 +20,7 @@ import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -54,6 +56,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.gameevent.*; import net.minecraft.world.level.pathfinder.BlockPathTypes; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.ForgeMod; @@ -74,7 +77,7 @@ public class Crab extends Animal implements IEntityAdditionalSpawnData, Bucketable { public static final int COLORS = 3; - public static final ResourceLocation CRAB_LOOT_TABLE = new ResourceLocation("quark", "entities/crab"); + public static final ResourceKey CRAB_LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE, "entities/crab"); private static final EntityDataAccessor SIZE_MODIFIER = SynchedEntityData.defineId(Crab.class, EntityDataSerializers.FLOAT); private static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(Crab.class, EntityDataSerializers.INT); @@ -413,7 +416,7 @@ public boolean isFood(ItemStack stack) { private Ingredient getTemptationItems() { if(temptationItems == null) temptationItems = Ingredient.of( - ItemTags.create(new ResourceLocation(Quark.MOD_ID, "crab_tempt_items"))); + Quark.asTagKey(Registries.ITEM,"crab_tempt_items")); return temptationItems; } @@ -424,9 +427,8 @@ public AgeableMob getBreedOffspring(@NotNull ServerLevel sworld, @NotNull Ageabl return new Crab(CrabsModule.crabType, level()); } - @NotNull @Override - protected ResourceLocation getDefaultLootTable() { + protected ResourceKey getDefaultLootTable() { return CRAB_LOOT_TABLE; } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java index 707207a212..4a314ddc99 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Forgotten.java @@ -2,12 +2,14 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; import net.minecraft.world.DifficultyInstance; @@ -34,6 +36,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraftforge.network.NetworkHooks; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -48,7 +51,7 @@ public class Forgotten extends Skeleton { public static final EntityDataAccessor SHEATHED_ITEM = SynchedEntityData.defineId(Forgotten.class, EntityDataSerializers.ITEM_STACK); - public static final ResourceLocation FORGOTTEN_LOOT_TABLE = new ResourceLocation("quark", "entities/forgotten"); + public static final ResourceKey FORGOTTEN_LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE, "entities/forgotten"); public Forgotten(EntityType type, Level world) { super(type, world); @@ -113,9 +116,8 @@ private void swap() { reassessWeaponGoal(); } - @NotNull @Override - protected ResourceLocation getDefaultLootTable() { + protected ResourceKey getDefaultLootTable() { return FORGOTTEN_LOOT_TABLE; } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java index 38c8ffc5ad..ad2103dfec 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java @@ -14,12 +14,14 @@ import net.minecraft.core.Holder; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.particles.SimpleParticleType; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; @@ -54,6 +56,7 @@ import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.pathfinder.BlockPathTypes; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; @@ -62,6 +65,7 @@ import org.violetmoon.quark.addons.oddities.block.TinyPotatoBlock; import org.violetmoon.quark.addons.oddities.module.TinyPotatoModule; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.content.mobs.ai.FindPlaceToSleepGoal; import org.violetmoon.quark.content.mobs.ai.SleepGoal; @@ -77,7 +81,7 @@ public class Foxhound extends Wolf implements Enemy { - public static final ResourceLocation FOXHOUND_LOOT_TABLE = new ResourceLocation("quark", "entities/foxhound"); + public static final ResourceKey FOXHOUND_LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE,"entities/foxhound"); private static final EntityDataAccessor TEMPTATION = SynchedEntityData.defineId(Foxhound.class, EntityDataSerializers.BOOLEAN); private static final EntityDataAccessor IS_BLUE = SynchedEntityData.defineId(Foxhound.class, EntityDataSerializers.BOOLEAN); @@ -222,9 +226,8 @@ public boolean isInWaterOrRain() { return false; } - @NotNull @Override - protected ResourceLocation getDefaultLootTable() { + protected ResourceKey getDefaultLootTable() { return FOXHOUND_LOOT_TABLE; } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java index 8ad56b0db0..ef3bab8b9d 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Stoneling.java @@ -5,12 +5,14 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -39,6 +41,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.pathfinder.BlockPathTypes; import net.minecraft.world.level.storage.loot.LootParams; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.HitResult; @@ -67,7 +70,7 @@ public class Stoneling extends PathfinderMob { - public static final ResourceLocation CARRY_LOOT_TABLE = new ResourceLocation("quark", "entities/stoneling_carry"); + public static final ResourceKey CARRY_LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE, "entities/stoneling_carry"); private static final EntityDataAccessor CARRYING_ITEM = SynchedEntityData.defineId(Stoneling.class, EntityDataSerializers.ITEM_STACK); private static final EntityDataAccessor VARIANT = SynchedEntityData.defineId(Stoneling.class, EntityDataSerializers.BYTE); @@ -263,7 +266,7 @@ public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, @NotNull Difficul entityData.set(HOLD_ANGLE, world.getRandom().nextFloat() * 90 - 45); if(!isTame && !world.isClientSide()) { - List items = world.getServer().getLootData() + List items = world.getServer().reloadableRegistries() .getLootTable(CARRY_LOOT_TABLE).getRandomItems(new LootParams.Builder(world.getLevel()) .withParameter(LootContextParams.ORIGIN, position()) .create(LootContextParamSets.CHEST)); @@ -506,7 +509,7 @@ public enum StonelingVariant implements SpawnGroupData { private final List blocks; StonelingVariant(String variantPath, Block... blocks) { - this.texture = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/stoneling/" + variantPath + ".png"); + this.texture = Quark.asResource("textures/model/entity/stoneling/" + variantPath + ".png"); this.blocks = Lists.newArrayList(blocks); } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java index 9b9885680a..80b86c0faf 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Toretoise.java @@ -53,7 +53,7 @@ public class Toretoise extends Animal { - private static final TagKey BREAKS_TORETOISE_ORE = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "breaks_toretoise_ore")); + private static final TagKey BREAKS_TORETOISE_ORE = BlockTags.create(Quark.asResource("breaks_toretoise_ore")); public static final int ORE_TYPES = 5; public static final int ANGERY_TIME = 20; @@ -105,7 +105,7 @@ private Ingredient getGoodFood() { private void computeGoodFood() { goodFood = Ingredient.of(ToretoiseModule.foods.stream() - .map(loc -> BuiltInRegistries.ITEM.get(new ResourceLocation(loc))) + .map(loc -> BuiltInRegistries.ITEM.get(ResourceLocation.parse(loc))) .filter(i -> i != Items.AIR) .map(ItemStack::new)); } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java index 0dd3ffda05..a1587ad83f 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Wraith.java @@ -3,10 +3,12 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -29,16 +31,18 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.NotNull; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.mobs.module.WraithModule; public class Wraith extends Zombie { - public static final ResourceLocation LOOT_TABLE = new ResourceLocation("quark:entities/wraith"); + public static final ResourceKey LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE, "entities/wraith"); private static final EntityDataAccessor IDLE_SOUND = SynchedEntityData.defineId(Wraith.class, EntityDataSerializers.STRING); private static final EntityDataAccessor HURT_SOUND = SynchedEntityData.defineId(Wraith.class, EntityDataSerializers.STRING); @@ -99,7 +103,7 @@ public float getVoicePitch() { } public SoundEvent getSound(EntityDataAccessor param) { - ResourceLocation loc = new ResourceLocation(entityData.get(param)); + ResourceLocation loc = ResourceLocation.parse(entityData.get(param)); return BuiltInRegistries.SOUND_EVENT.get(loc); } @@ -173,9 +177,8 @@ public void readAdditionalSaveData(@NotNull CompoundTag compound) { entityData.set(DEATH_SOUND, compound.getString(TAG_DEATH_SOUND)); } - @NotNull @Override - protected ResourceLocation getDefaultLootTable() { + protected ResourceKey getDefaultLootTable() { return LOOT_TABLE; } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java index bb3ec9b3d7..b9779114f2 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/CrabsModule.java @@ -150,7 +150,7 @@ public final void entityAttrs(ZEntityAttributeCreation e) { @LoadEvent public final void setup(ZCommonSetup event) { - crabSpawnableTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "crab_spawnable")); + crabSpawnableTag = Quark.asTagKey(Registries.BLOCK,"crab_spawnable"); } @ZetaLoadModule(clientReplacement = true) diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java index c7604865ac..4f38783723 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/FoxhoundModule.java @@ -95,7 +95,7 @@ public final void entityAttrs(ZEntityAttributeCreation e) { @LoadEvent public final void setup(ZCommonSetup event) { - foxhoundSpawnableTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "foxhound_spawnable")); + foxhoundSpawnableTag = BlockTags.create(Quark.asResource("foxhound_spawnable")); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java b/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java index 1e9e3120f0..4d86648b62 100644 --- a/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/module/WraithModule.java @@ -116,8 +116,8 @@ public final void entityAttrs(ZEntityAttributeCreation e) { @LoadEvent public final void setup(ZCommonSetup event) { - wraithSpawnableTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "wraith_spawnable")); - soulBeadTargetTag = TagKey.create(Registries.STRUCTURE, new ResourceLocation(Quark.MOD_ID, "soul_bead_target")); + wraithSpawnableTag = Quark.asTagKey(Registries.BLOCK,"wraith_spawnable"); + soulBeadTargetTag = Quark.asTagKey(Registries.STRUCTURE,"soul_bead_target"); } diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java index 38c9a275b8..bfcacb9bfc 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/GlintRenderTypes.java @@ -145,6 +145,6 @@ private static RenderType buildArmorEntityGlintRenderType(String name) { } private static ResourceLocation texture(String name) { - return new ResourceLocation(Quark.MOD_ID, "textures/glint/enchanted_item_glint_" + name + ".png"); + return Quark.asResource("textures/glint/enchanted_item_glint_" + name + ".png"); } } diff --git a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java index 4f3297085b..e91517e1fd 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java +++ b/src/main/java/org/violetmoon/quark/content/tools/client/render/entity/TorchArrowRenderer.java @@ -9,7 +9,7 @@ public class TorchArrowRenderer extends ArrowRenderer { - public static final ResourceLocation TORCH_ARROW_LOCATION = new ResourceLocation(Quark.MOD_ID, "textures/model/entity/torch_arrow.png"); + public static final ResourceLocation TORCH_ARROW_LOCATION = Quark.asResource("textures/model/entity/torch_arrow.png"); public TorchArrowRenderer(EntityRendererProvider.Context p_174399_) { super(p_174399_); @@ -17,7 +17,7 @@ public TorchArrowRenderer(EntityRendererProvider.Context p_174399_) { @Override public ResourceLocation getTextureLocation(TorchArrow p_116001_) { - return new ResourceLocation(Quark.MOD_ID, "textures/model/entity/torch_arrow.png"); + return TORCH_ARROW_LOCATION; } } diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java index e157ad9bbf..8fad16503e 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/PathfindersQuillItem.java @@ -86,7 +86,7 @@ public static ResourceLocation getTargetBiome(ItemStack stack) { if(str.isEmpty()) return null; - return new ResourceLocation(str); + return ResourceLocation.parse(str); } public static int getOverlayColor(ItemStack stack) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java index bef591ad17..cf189bd76b 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/RuneItem.java @@ -22,15 +22,15 @@ */ public class RuneItem extends ZetaSmithingTemplateItem implements IRuneColorProvider { - private static final Component RUNE_APPLIES_TO = Component.translatable(Util.makeDescriptionId("item", new ResourceLocation(Quark.MOD_ID, "smithing_template.rune.applies_to"))).withStyle(Z_DESCRIPTION_FORMAT); - private static final Component RUNE_INGREDIENTS = Component.translatable(Util.makeDescriptionId("item", new ResourceLocation(Quark.MOD_ID, "smithing_template.rune.ingredients"))).withStyle(Z_DESCRIPTION_FORMAT); - private static final Component RUNE_UPGRADE = Component.translatable(Util.makeDescriptionId("upgrade", new ResourceLocation(Quark.MOD_ID, "rune_upgrade"))).withStyle(Z_TITLE_FORMAT); - private static final Component RUNE_BASE_SLOT_DESCRIPTION = Component.translatable(Util.makeDescriptionId("item", new ResourceLocation(Quark.MOD_ID, "smithing_template.rune.base_slot_description"))); - private static final Component RUNE_ADDITIONS_SLOT_DESCRIPTION = Component.translatable(Util.makeDescriptionId("item", new ResourceLocation(Quark.MOD_ID, "smithing_template.rune.additions_slot_description"))); - - private static final ResourceLocation EMPTY_SLOT_BLAZE_POWDER = new ResourceLocation(Quark.MOD_ID, "item/empty_slot_blaze_powder"); - private static final ResourceLocation EMPTY_SLOT_DYE = new ResourceLocation(Quark.MOD_ID, "item/empty_slot_dye"); - private static final ResourceLocation EMPTY_SLOT_NOTHING = new ResourceLocation(Quark.MOD_ID, "item/empty_slot_nothing"); + private static final Component RUNE_APPLIES_TO = Component.translatable(Util.makeDescriptionId("item", Quark.asResource("smithing_template.rune.applies_to"))).withStyle(Z_DESCRIPTION_FORMAT); + private static final Component RUNE_INGREDIENTS = Component.translatable(Util.makeDescriptionId("item", Quark.asResource("smithing_template.rune.ingredients"))).withStyle(Z_DESCRIPTION_FORMAT); + private static final Component RUNE_UPGRADE = Component.translatable(Util.makeDescriptionId("upgrade", Quark.asResource("rune_upgrade"))).withStyle(Z_TITLE_FORMAT); + private static final Component RUNE_BASE_SLOT_DESCRIPTION = Component.translatable(Util.makeDescriptionId("item", Quark.asResource("smithing_template.rune.base_slot_description"))); + private static final Component RUNE_ADDITIONS_SLOT_DESCRIPTION = Component.translatable(Util.makeDescriptionId("item", Quark.asResource("smithing_template.rune.additions_slot_description"))); + + private static final ResourceLocation EMPTY_SLOT_BLAZE_POWDER = Quark.asResource("item/empty_slot_blaze_powder"); + private static final ResourceLocation EMPTY_SLOT_DYE = Quark.asResource("item/empty_slot_dye"); + private static final ResourceLocation EMPTY_SLOT_NOTHING = Quark.asResource("item/empty_slot_nothing"); public RuneItem(String regname, ZetaModule module) { super(regname, module, RUNE_APPLIES_TO, RUNE_INGREDIENTS, RUNE_UPGRADE, RUNE_BASE_SLOT_DESCRIPTION, RUNE_ADDITIONS_SLOT_DESCRIPTION, anyToolIconList(), diff --git a/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java b/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java index 81d3d5bd4e..68c5c24cb4 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java +++ b/src/main/java/org/violetmoon/quark/content/tools/loot/InBiomeCondition.java @@ -42,7 +42,7 @@ public void serialize(@NotNull JsonObject object, @NotNull InBiomeCondition cond @NotNull public InBiomeCondition deserialize(@NotNull JsonObject object, @NotNull JsonDeserializationContext deserializationContext) { String key = GsonHelper.getAsString(object, "target"); - ResourceLocation target = new ResourceLocation(key); + ResourceLocation target = ResourceLocation.parse(key); return new InBiomeCondition(target); } diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java index 4ac59f5b6d..4de3b95b7d 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java @@ -23,6 +23,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.joml.Matrix4f; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.type.RGBAColorConfig; import org.violetmoon.quark.content.tools.item.AbacusItem; import org.violetmoon.zeta.client.event.load.ZClientSetup; @@ -57,7 +58,7 @@ public static class Client extends AbacusModule { @LoadEvent public void clientSetup(ZClientSetup e) { - e.enqueueWork(() -> ItemProperties.register(abacus, new ResourceLocation("count"), AbacusItem.Client.ITEM_PROPERTY_FUNCTION)); + e.enqueueWork(() -> ItemProperties.register(abacus, Quark.asResource("count"), AbacusItem.Client.ITEM_PROPERTY_FUNCTION)); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java index 105e882267..83050eb4c9 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java @@ -141,7 +141,7 @@ public void register(ZRegister event) { ancient_tome = new AncientTomeItem(this); tomeEnchantType = new LootItemFunctionType(new EnchantTome.Serializer()); - Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, new ResourceLocation(Quark.MOD_ID, "tome_enchant"), tomeEnchantType); + Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, Quark.asResource("tome_enchant"), tomeEnchantType); overlevelTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("overlevel"); instamineDeepslateTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("instamine_deepslate"); @@ -164,7 +164,7 @@ public void configChanged(ZConfigChanged event) { String[] split = table.split(","); if(split.length == 2) { int weight; - ResourceLocation loc = new ResourceLocation(split[0]); + ResourceLocation loc = ResourceLocation.parse(split[0]); try { weight = Integer.parseInt(split[1]); } catch (NumberFormatException e) { @@ -359,7 +359,7 @@ private static boolean isOverlevel(ItemStack stack) { return false; } - private static final ResourceLocation OVERLEVEL_COLOR_HANDLER = new ResourceLocation(Quark.MOD_ID, "overlevel_rune"); + private static final ResourceLocation OVERLEVEL_COLOR_HANDLER = Quark.asResource("overlevel_rune"); @PlayEvent public void attachRuneCapability(ZAttachCapabilities.ItemStackCaps event) { @@ -422,7 +422,7 @@ private void setupEnchantList() { public static void initializeEnchantmentList(Iterable enchantNames, List enchants) { enchants.clear(); for(String s : enchantNames) { - Enchantment enchant = BuiltInRegistries.ENCHANTMENT.get(new ResourceLocation(s)); + Enchantment enchant = BuiltInRegistries.ENCHANTMENT.get(ResourceLocation.parse(s)); if(enchant != null && !EnchantmentsBegoneModule.shouldBegone(enchant)) enchants.add(enchant); } diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java index ff66e751f3..6ee60243ee 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/BeaconRedirectionModule.java @@ -3,6 +3,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; +import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -41,7 +42,7 @@ @ZetaLoadModule(category = "tools") public class BeaconRedirectionModule extends ZetaModule { - private static final TagKey BEACON_TRANSPARENT = BlockTags.create(new ResourceLocation("quark:beacon_transparent")); + private static final TagKey BEACON_TRANSPARENT = Quark.asTagKey(Registries.BLOCK,"beacon_transparent"); @Config public static int horizontalMoveLimit = 64; diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java index c464f39bf2..5f2dd4d7d4 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/ParrotEggsModule.java @@ -57,7 +57,7 @@ @ZetaLoadModule(category = "tools") public class ParrotEggsModule extends ZetaModule { - private static final ResourceLocation KOTO = new ResourceLocation("quark", "textures/model/entity/variants/kotobirb.png"); + private static final ResourceLocation KOTO = Quark.asResource("textures/model/entity/variants/kotobirb.png"); private static final String EGG_TIMER = "quark:parrot_egg_timer"; public static EntityType parrotEggType; @@ -112,7 +112,7 @@ protected Projectile getProjectile(@NotNull Level world, @NotNull Position pos, @LoadEvent public final void setup(ZCommonSetup event) { - feedTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "parrot_feed")); + feedTag = Quark.asTagKey(Registries.ITEM,"parrot_feed"); } @LoadEvent diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java index 6eda241e67..121253fd2f 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/PathfinderMapsModule.java @@ -153,7 +153,7 @@ public final void register(ZRegister event) { loadTradeInfo(Biomes.CHERRY_GROVE, true, 5, 20, 26, 0xE9A9E8); inBiomeConditionType = new LootItemConditionType(new InBiomeCondition.InBiomeSerializer()); - Registry.register(BuiltInRegistries.LOOT_CONDITION_TYPE, new ResourceLocation(Quark.MOD_ID, "in_biome"), inBiomeConditionType); + Registry.register(BuiltInRegistries.LOOT_CONDITION_TYPE, Quark.asResource("in_biome"), inBiomeConditionType); pathfinderMapTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("pathfinder_map_center"); @@ -283,7 +283,7 @@ private void loadCustomTradeInfo(String line) throws IllegalArgumentException { if(tokens.length != 5 && tokens.length != 6) // Silently ignore old name format throw new IllegalArgumentException("Wrong number of parameters " + tokens.length + " (expected 5)"); - ResourceLocation biomeName = new ResourceLocation(tokens[0]); + ResourceLocation biomeName = ResourceLocation.parse(tokens[0]); int level = Integer.parseInt(tokens[1]); int minPrice = Integer.parseInt(tokens[2]); int maxPrice = Integer.parseInt(tokens[3]); @@ -368,7 +368,7 @@ public boolean test(Holder biomeHolder) { public static class Client extends PathfinderMapsModule { @LoadEvent public void clientSetup(ZClientSetup e) { - e.enqueueWork(() -> ItemProperties.register(pathfinders_quill, new ResourceLocation("has_biome"), + e.enqueueWork(() -> ItemProperties.register(pathfinders_quill, Quark.asResource("has_biome"), (stack, world, entity, i) -> (PathfindersQuillItem.getTargetBiome(stack) != null) ? 1 : 0)); } diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java index 494e061f9d..519cae3715 100755 --- a/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/PickarangModule.java @@ -61,9 +61,9 @@ public class PickarangModule extends ZetaModule { private static final List> knownTypes = new ArrayList<>(); private static boolean isEnabled; - public static final TagKey pickarangImmuneTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "pickarang_immune")); + public static final TagKey pickarangImmuneTag = Quark.asTagKey(Registries.BLOCK,"pickarang_immune"); - public static final ResourceKey pickarangDamageType = ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(Quark.MOD_ID, "pickarang")); + public static final ResourceKey pickarangDamageType = Quark.asResourceKey(Registries.DAMAGE_TYPE,"pickarang"); public static ManualTrigger throwPickarangTrigger; public static ManualTrigger useFlamerangTrigger; diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/SeedPouchModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/SeedPouchModule.java index a884b4c276..529d5466dc 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/SeedPouchModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/SeedPouchModule.java @@ -80,7 +80,7 @@ public static class Client extends SeedPouchModule { @LoadEvent public void clientSetup(ZClientSetup e) { e.enqueueWork(() -> - ItemProperties.register(seed_pouch, new ResourceLocation("pouch_items"), (ClampedItemPropertyFunction) (pouch, level, entityIn, pSeed) -> { + ItemProperties.register(seed_pouch, Quark.asResource("pouch_items"), (ClampedItemPropertyFunction) (pouch, level, entityIn, pSeed) -> { SeedPouchItem.PouchContents contents = SeedPouchItem.getContents(pouch); if(entityIn instanceof Player player && contents.canFit(player.containerMenu.getCarried())) diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java index 612af087cf..fd1e6540a5 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/SkullPikesModule.java @@ -59,7 +59,7 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - pikeTrophiesTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "pike_trophies")); + pikeTrophiesTag = Quark.asResourceKey(Registries.BLOCK, "pike_trophies")); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java index eb48bac2e9..8fe4d4b0a3 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/SlimeInABucketModule.java @@ -13,6 +13,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.gameevent.GameEvent; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tools.item.SlimeInABucketItem; import org.violetmoon.zeta.client.event.load.ZClientSetup; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -78,7 +79,7 @@ else if(!player.getInventory().add(outStack)) public static class Client extends SlimeInABucketModule { @LoadEvent public void clientSetup(ZClientSetup event) { - event.enqueueWork(() -> ItemProperties.register(slime_in_a_bucket, new ResourceLocation("excited"), + event.enqueueWork(() -> ItemProperties.register(slime_in_a_bucket, Quark.asResource("excited"), (stack, world, e, id) -> ItemNBTHelper.getBoolean(stack, SlimeInABucketItem.TAG_EXCITED, false) ? 1 : 0)); } } diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java index 0cdea0b159..7cc01e9a2c 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/TorchArrowModule.java @@ -39,7 +39,7 @@ public class TorchArrowModule extends ZetaModule { @Hint public static Item torch_arrow; - public static final TagKey ignoreMultishot = ItemTags.create(new ResourceLocation("quark:ignore_multishot")); + public static final TagKey ignoreMultishot = Quark.asTagKey(Registries.ITEM,"ignore_multishot"); @LoadEvent public final void register(ZRegister event) { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java index c3b34bf810..a04101dd41 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteDescriptor.java @@ -2,6 +2,7 @@ import net.minecraft.resources.ResourceLocation; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tweaks.module.EmotesModule; public class CustomEmoteDescriptor extends EmoteDescriptor { @@ -11,12 +12,12 @@ public CustomEmoteDescriptor(String name, String regName, int index) { } public static ResourceLocation getSprite(String name) { - ResourceLocation customRes = new ResourceLocation(EmoteHandler.CUSTOM_EMOTE_NAMESPACE, name); + ResourceLocation customRes = ResourceLocation.fromNamespaceAndPath(EmoteHandler.CUSTOM_EMOTE_NAMESPACE, name); //if(EmotesModule.Client.resourcePack.hasResource(PackType.CLIENT_RESOURCES, customRes)) if(EmotesModule.Client.resourcePack.hasResource(name)) return customRes; - return new ResourceLocation("quark", "textures/emote/custom.png"); + return Quark.asResource("textures/emote/custom.png"); } @Override diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java index 0f12f37708..3e2726cfc5 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/CustomEmoteIconResourcePack.java @@ -104,9 +104,9 @@ private void crawl(File rootPath, int maxDepth, String namespace, List 0) this.crawl(file, maxDepth - 1, namespace, allResources, path + file.getName() + "/", filter); - } else if(!file.getName().endsWith(".mcmeta") && filter.test(new ResourceLocation(namespace, path + file.getName()))) { + } else if(!file.getName().endsWith(".mcmeta") && filter.test(ResourceLocation.fromNamespaceAndPath(namespace, path + file.getName()))) { try { - allResources.add(new ResourceLocation(namespace, path + file.getName())); + allResources.add(ResourceLocation.fromNamespaceAndPath(namespace, path + file.getName())); } catch (ResourceLocationException e) { Quark.LOG.error(e.getMessage()); } diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteDescriptor.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteDescriptor.java index 293fff2db7..56f3fc542b 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteDescriptor.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteDescriptor.java @@ -4,14 +4,15 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Player; +import org.violetmoon.quark.base.Quark; public class EmoteDescriptor { - public static final ResourceLocation TIER_1 = new ResourceLocation("quark", "textures/emote/patreon_t1.png"); - public static final ResourceLocation TIER_2 = new ResourceLocation("quark", "textures/emote/patreon_t2.png"); - public static final ResourceLocation TIER_3 = new ResourceLocation("quark", "textures/emote/patreon_t3.png"); - public static final ResourceLocation TIER_4 = new ResourceLocation("quark", "textures/emote/patreon_t4.png"); - public static final ResourceLocation TIER_GOD = new ResourceLocation("quark", "textures/emote/patreon_t99.png"); + public static final ResourceLocation TIER_1 = Quark.asResource("textures/emote/patreon_t1.png"); + public static final ResourceLocation TIER_2 = Quark.asResource("textures/emote/patreon_t2.png"); + public static final ResourceLocation TIER_3 = Quark.asResource("textures/emote/patreon_t3.png"); + public static final ResourceLocation TIER_4 = Quark.asResource("textures/emote/patreon_t4.png"); + public static final ResourceLocation TIER_GOD = Quark.asResource("textures/emote/patreon_t99.png"); public final Class clazz; public final int index; @@ -23,7 +24,7 @@ public class EmoteDescriptor { private int tier; public EmoteDescriptor(Class clazz, String name, String regName, int index) { - this(clazz, name, regName, index, new ResourceLocation("quark", "textures/emote/" + name + ".png"), new EmoteTemplate(name + ".emote")); + this(clazz, name, regName, index, Quark.asResource("textures/emote/" + name + ".png"), new EmoteTemplate(name + ".emote")); } public EmoteDescriptor(Class clazz, String name, String regName, int index, ResourceLocation texture, EmoteTemplate template) { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java index 67577454c7..7c6d278064 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/client/emote/EmoteTemplate.java @@ -386,7 +386,7 @@ private static Timeline sound(EmoteTemplate em, Player player, Timeline timeline throw new IllegalArgumentException("Illegal number in function sound", ex); } - ResourceLocation soundEvent = new ResourceLocation(type); + ResourceLocation soundEvent = ResourceLocation.parse(type); List> children = timeline.getChildren(); diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java index 740e67a784..da5ab3c53a 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/CompassesWorkEverywhereModule.java @@ -13,6 +13,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.dimension.LevelStem; +import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.tweaks.client.item.ClockTimePropertyFunction; import org.violetmoon.quark.content.tweaks.client.item.CompassAnglePropertyFunction; import org.violetmoon.zeta.client.event.load.ZClientSetup; @@ -131,10 +132,10 @@ public void clientSetup(ZClientSetup e) { return; if(enableCompassNerf || enableNether || enableEnd) - ItemProperties.register(Items.COMPASS, new ResourceLocation("angle"), new CompassAnglePropertyFunction()); + ItemProperties.register(Items.COMPASS, Quark.asResource("angle"), new CompassAnglePropertyFunction()); if(enableClockNerf) - ItemProperties.register(Items.CLOCK, new ResourceLocation("time"), new ClockTimePropertyFunction()); + ItemProperties.register(Items.CLOCK, Quark.asResource("time"), new ClockTimePropertyFunction()); }); } diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java index 2a57d367ee..a87d74eacb 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/DiamondRepairModule.java @@ -63,13 +63,13 @@ public final void configChanged(ZConfigChanged event) { for(String s : repairChangesList) { String[] toks = s.split("="); if(toks.length == 2) { - ResourceLocation itemRes = new ResourceLocation(toks[0]); + ResourceLocation itemRes = ResourceLocation.parse(toks[0]); if(BuiltInRegistries.ITEM.containsKey(itemRes)) { String repairItems = toks[1]; String[] repairToks = repairItems.split(","); for(String repairTok : repairToks) { - ResourceLocation repairItemRes = new ResourceLocation(repairTok); + ResourceLocation repairItemRes = ResourceLocation.parse(repairTok); if(BuiltInRegistries.ITEM.containsKey(repairItemRes)) { Item item = BuiltInRegistries.ITEM.get(itemRes); diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java index 702bec067b..718e6a23b7 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/DoubleDoorOpeningModule.java @@ -5,6 +5,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; @@ -59,7 +60,7 @@ public class DoubleDoorOpeningModule extends ZetaModule { @LoadEvent public void setup(ZCommonSetup e) { - nonDoubleDoorTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "non_double_door")); + nonDoubleDoorTag = Quark.asTagKey(Registries.BLOCK,"non_double_door"); } public boolean openBlock(Level world, Player player, BlockPos pos) { diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java index f37ceb0166..9da0262cc5 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/EnhancedLaddersModule.java @@ -4,6 +4,7 @@ import net.minecraft.client.player.Input; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; @@ -71,8 +72,8 @@ public class EnhancedLaddersModule extends ZetaModule { @LoadEvent public final void setup(ZCommonSetup event) { - laddersTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "ladders")); - laddersBlockTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "ladders")); + laddersTag = Quark.asTagKey(Registries.ITEM,"ladders"); + laddersBlockTag = Quark.asTagKey(Registries.BLOCK,"ladders"); } @LoadEvent diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java index b69276d656..672afa8e98 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/GlassShardModule.java @@ -3,6 +3,7 @@ import java.util.EnumMap; import java.util.Map; +import net.minecraft.core.registries.Registries; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.experimental.module.VariantSelectorModule; import org.violetmoon.quark.content.tweaks.block.DirtyGlassBlock; @@ -63,6 +64,6 @@ public final void register(ZRegister event) { @LoadEvent public final void setup(ZCommonSetup event) { - shardTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "shards")); + shardTag = Quark.asTagKey(Registries.ITEM,"shards"); } } diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java index 55e2f5e2ae..2aca7b502e 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/HoeHarvestingModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.core.registries.Registries; import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.config.Config; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -76,7 +77,7 @@ public static boolean isHoe(ItemStack itemStack) { @LoadEvent public final void setup(ZCommonSetup event) { - bigHarvestingHoesTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "big_harvesting_hoes")); + bigHarvestingHoesTag = Quark.asTagKey(Registries.ITEM, "big_harvesting_hoes"); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java index eb529f2e9f..2bcefed9c1 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/NoDurabilityOnCosmeticsModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.tweaks.module; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -25,7 +26,7 @@ public class NoDurabilityOnCosmeticsModule extends ZetaModule { @LoadEvent public final void setup(ZCommonSetup event) { - cosmeticTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "cosmetic_anvil_items")); + cosmeticTag = Quark.asTagKey(Registries.ITEM,"cosmetic_anvil_items")); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ReacharoundPlacingModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ReacharoundPlacingModule.java index 0fde90b43b..d742d63115 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ReacharoundPlacingModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ReacharoundPlacingModule.java @@ -11,6 +11,7 @@ import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; @@ -48,8 +49,8 @@ @ZetaLoadModule(category = "tweaks") public class ReacharoundPlacingModule extends ZetaModule { - public static final ResourceLocation OVERLAY_HORIZONTAL = new ResourceLocation(Quark.MOD_ID, "textures/gui/reacharound_overlay_horizontal.png"); - public static final ResourceLocation OVERLAY_VERTICAL = new ResourceLocation(Quark.MOD_ID, "textures/gui/reacharound_overlay_vertical.png"); + public static final ResourceLocation OVERLAY_HORIZONTAL = Quark.asResource("textures/gui/reacharound_overlay_horizontal.png"); + public static final ResourceLocation OVERLAY_VERTICAL = Quark.asResource("textures/gui/reacharound_overlay_vertical.png"); @Config @Config.Min(0) @@ -69,7 +70,7 @@ public class ReacharoundPlacingModule extends ZetaModule { @LoadEvent public final void setup(ZCommonSetup event) { - reacharoundTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "reacharound_able")); + reacharoundTag = Quark.asTagKey(Registries.ITEM, "reacharound_able"); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/SimpleHarvestModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/SimpleHarvestModule.java index 1897f1e4e5..4f01b2700f 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/SimpleHarvestModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/SimpleHarvestModule.java @@ -14,6 +14,7 @@ import java.util.Map; import java.util.Set; +import net.minecraft.core.registries.Registries; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.LivingEntity; import net.minecraftforge.fml.loading.FMLLoader; @@ -116,7 +117,7 @@ public class SimpleHarvestModule extends ZetaModule { @LoadEvent public void setup(ZCommonSetup event) { - simpleHarvestBlacklistedTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "simple_harvest_blacklisted")); + simpleHarvestBlacklistedTag = Quark.asTagKey(Registries.BLOCK,"simple_harvest_blacklisted"); } @LoadEvent @@ -153,7 +154,7 @@ public void configChanged(ZConfigChanged event) { } for(String blockName : rightClickableBlocks) { - Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(blockName)); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(blockName)); if(block != Blocks.AIR) rightClickCrops.add(block); } diff --git a/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java b/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java index 9cc401e8ea..b34f98f030 100644 --- a/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java +++ b/src/main/java/org/violetmoon/quark/content/world/gen/ObsidianSpikeGenerator.java @@ -105,7 +105,7 @@ public static void placeSpikeAt(WorldGenRegion world, BlockPos pos, RandomSource placePos = placePos.below(); world.setBlock(placePos, Blocks.CHEST.defaultBlockState(), 0); - RandomizableContainerBlockEntity.setLootTable(world, rand, placePos, new ResourceLocation("minecraft", "chests/nether_bridge")); + RandomizableContainerBlockEntity.setLootTable(world, rand, placePos, ResourceLocation.withDefaultNamespace("chests/nether_bridge")); } } } diff --git a/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java b/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java index 8e0b2944ad..37af190cc5 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/BigStoneClustersModule.java @@ -117,7 +117,7 @@ public final void configChanged(ZConfigChanged event) { } String dimFinal = dimension; - BuiltInRegistries.BLOCK.getOptional(new ResourceLocation(bname)).ifPresent(blockObj -> { + BuiltInRegistries.BLOCK.getOptional(ResourceLocation.parse(bname)).ifPresent(blockObj -> { if(blockObj != Blocks.AIR) { if(dimFinal == null) blockReplacePredicate = blockReplacePredicate.or((w, b) -> blockObj == b); diff --git a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java index 3752c408b2..4cdd3dbd5e 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java @@ -119,7 +119,7 @@ public void addAdditionalHints(ZGatherHints event) { } private static ResourceKey> registerKey(String name) { - return ResourceKey.create(Registries.CONFIGURED_FEATURE, Quark.asResource(name)); + return Quark.asResourceKey(Registries.CONFIGURED_FEATURE, name); } } diff --git a/src/main/java/org/violetmoon/quark/content/world/module/CorundumModule.java b/src/main/java/org/violetmoon/quark/content/world/module/CorundumModule.java index 4cdf002415..c6b2f96cfd 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/CorundumModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/CorundumModule.java @@ -2,6 +2,7 @@ import java.util.List; +import net.minecraft.core.registries.Registries; import org.apache.commons.lang3.tuple.Pair; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.util.CorundumColor; @@ -91,7 +92,7 @@ public class CorundumModule extends ZetaModule { public static List crystals = Lists.newArrayList(); public static List clusters = Lists.newArrayList(); @Hint - public static final TagKey corundumTag = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "corundum")); + public static final TagKey corundumTag = Quark.asTagKey(Registries.BLOCK,"corundum"); @LoadEvent public final void register(ZRegister event) { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java b/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java index ba67c4cfa7..f470c23ba9 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/FairyRingsModule.java @@ -45,7 +45,7 @@ public final void setup(ZCommonSetup event) { public final void configChanged(ZConfigChanged event) { ores.clear(); for(String s : oresRaw) { - Block b = BuiltInRegistries.BLOCK.get(new ResourceLocation(s)); + Block b = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(s)); if(b != Blocks.AIR) { ores.add(b.defaultBlockState()); } else { diff --git a/src/main/java/org/violetmoon/quark/content/world/module/FallenLogsModule.java b/src/main/java/org/violetmoon/quark/content/world/module/FallenLogsModule.java index 3a7045a1c2..472534d3b9 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/FallenLogsModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/FallenLogsModule.java @@ -61,8 +61,8 @@ public class FallenLogsModule extends ZetaModule { @LoadEvent public final void setup(ZCommonSetup event) { - reducedLogsTag = TagKey.create(Registries.BIOME, new ResourceLocation(Quark.MOD_ID, "has_lower_fallen_tree_density")); - canSpawnOnTag = TagKey.create(Registries.BLOCK, new ResourceLocation(Quark.MOD_ID, "fallen_log_can_spawn_on")); + reducedLogsTag = Quark.asTagKey(Registries.BIOME, "has_lower_fallen_tree_density"); + canSpawnOnTag = Quark.asTagKey(Registries.BLOCK, "fallen_log_can_spawn_on"); WorldGenHandler.addGenerator(this, new FallenLogGenerator(dimensions), Decoration.TOP_LAYER_MODIFICATION, QuarkWorldGenWeights.FALLEN_LOGS); } @@ -75,8 +75,8 @@ public final void configChanged(ZConfigChanged event) { String k = toks[0]; String v = toks[1]; - TagKey tag = TagKey.create(Registries.BIOME, new ResourceLocation(k)); - Block block = BuiltInRegistries.BLOCK.get(new ResourceLocation(v)); + TagKey tag = Quark.asTagKey(Registries.BIOME, (k)); + Block block = BuiltInRegistries.BLOCK.get(ResourceLocation.parse(v)); if(block == null) throw new IllegalArgumentException("Block " + v + " doesn't exist"); diff --git a/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java b/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java index f71676fda9..7aa64432bf 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/GlimmeringWealdModule.java @@ -37,8 +37,8 @@ @ZetaLoadModule(category = "world") public class GlimmeringWealdModule extends ZetaModule { - public static final ResourceLocation BIOME_NAME = new ResourceLocation(Quark.MOD_ID, "glimmering_weald"); - public static final ResourceKey BIOME_KEY = ResourceKey.create(Registries.BIOME, BIOME_NAME); + public static final ResourceLocation BIOME_NAME = Quark.asResource("glimmering_weald"); + public static final ResourceKey BIOME_KEY = Quark.asResourceKey(Registries.BIOME, "glimmering_weald"); public static GlowShroomsFeature glow_shrooms_feature; public static GlowExtrasFeature glow_shrooms_extra_feature; @@ -116,7 +116,7 @@ public void postRegister(ZRegister.Post e) { @LoadEvent public void setup(ZCommonSetup e) { - glowShroomFeedablesTag = ItemTags.create(new ResourceLocation(Quark.MOD_ID, "glow_shroom_feedables")); + glowShroomFeedablesTag = Quark.asTagKey(Registries.ITEM,"glow_shroom_feedables"); e.enqueueWork(() -> { ComposterBlock.COMPOSTABLES.put(glow_shroom.asItem(), 0.65F); diff --git a/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java b/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java index b62fa2defa..604f207041 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/MonsterBoxModule.java @@ -39,8 +39,8 @@ public class MonsterBoxModule extends ZetaModule { public static final String TAG_MONSTER_BOX_SPAWNED = "quark:monster_box_spawned"; - public static final ResourceLocation MONSTER_BOX_LOOT_TABLE = new ResourceLocation(Quark.MOD_ID, "misc/monster_box"); - public static final ResourceLocation MONSTER_BOX_SPAWNS_LOOT_TABLE = new ResourceLocation(Quark.MOD_ID, "misc/monster_box_spawns"); + public static final ResourceLocation MONSTER_BOX_LOOT_TABLE = Quark.asResource("misc/monster_box"); + public static final ResourceLocation MONSTER_BOX_SPAWNS_LOOT_TABLE = Quark.asResource("misc/monster_box_spawns"); public static BlockEntityType blockEntityType; diff --git a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java index 9f094c5217..6100757ef2 100644 --- a/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java +++ b/src/main/java/org/violetmoon/quark/content/world/undergroundstyle/base/UndergroundStyle.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.world.undergroundstyle.base; +import net.minecraft.core.registries.Registries; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.world.undergroundstyle.base.UndergroundStyleGenerator.Context; import org.violetmoon.zeta.util.MiscUtil; @@ -15,7 +16,7 @@ public abstract class UndergroundStyle { - private static final TagKey UNDERGROUND_BIOME_REPLACEABLE = BlockTags.create(new ResourceLocation(Quark.MOD_ID, "underground_biome_replaceable")); + private static final TagKey UNDERGROUND_BIOME_REPLACEABLE = Quark.asTagKey(Registries.BLOCK, "underground_biome_replaceable")); public boolean canReplace(BlockState state) { return state.canBeReplaced() || state.is(UNDERGROUND_BIOME_REPLACEABLE); diff --git a/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java b/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java index 9c12e386cd..f3b744054a 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/InfluenceCategory.java @@ -21,9 +21,9 @@ public class InfluenceCategory implements IRecipeCategory { - public static final ResourceLocation UID = new ResourceLocation(Quark.MOD_ID, "influence"); + public static final ResourceLocation UID = Quark.asResource("influence"); - public static final ResourceLocation TEXTURE = new ResourceLocation(Quark.MOD_ID, "textures/gui/jei_influence.png"); + public static final ResourceLocation TEXTURE = Quark.asResource("textures/gui/jei_influence.png"); private final IDrawable icon; private final IDrawableStatic background; diff --git a/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java b/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java index 95937e18ec..919b866947 100644 --- a/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java +++ b/src/main/java/org/violetmoon/quark/integration/jei/QuarkJeiPlugin.java @@ -40,7 +40,7 @@ @JeiPlugin public class QuarkJeiPlugin implements IModPlugin { - private static final ResourceLocation UID = new ResourceLocation(Quark.MOD_ID, Quark.MOD_ID); + private static final ResourceLocation UID = Quark.asResource(Quark.MOD_ID); public static final RecipeType INFLUENCING = RecipeType.create(Quark.MOD_ID, "influence", InfluenceEntry.class); diff --git a/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java b/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java index eec0f115d8..690ab70ac5 100644 --- a/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java +++ b/src/main/java/org/violetmoon/quark/integration/lootr/client/LootrVariantChestRenderer.java @@ -63,6 +63,6 @@ else if(opened) tex.append("lootr_normal"); } - return new Material(Sheets.CHEST_SHEET, new ResourceLocation(Quark.MOD_ID, tex.toString())); + return new Material(Sheets.CHEST_SHEET, Quark.asResource(tex.toString())); } } From 827cbac79c06350d8119ee1017ec806ef1de4e79 Mon Sep 17 00:00:00 2001 From: Partonetrain Date: Sat, 4 Jan 2025 16:08:38 -0600 Subject: [PATCH 2/2] style --- .../quark/content/building/module/RainbowLampsModule.java | 2 +- .../quark/content/building/module/VerticalSlabsModule.java | 2 +- .../quark/content/building/module/WoodenPostsModule.java | 7 +++---- .../org/violetmoon/quark/content/mobs/entity/Crab.java | 2 +- .../org/violetmoon/quark/content/mobs/entity/Foxhound.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java index 18538acbd4..c52ef43d15 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/RainbowLampsModule.java @@ -36,7 +36,7 @@ public static boolean isCorundum() { @LoadEvent public final void setup(ZCommonSetup event) { - lampTag = Quark.asTagKey(Registries.BLOCK,"crystal_lamp"); + lampTag = Quark.asTagKey(Registries.BLOCK, "crystal_lamp"); } @LoadEvent diff --git a/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java index 45038f3f62..30a3b0e502 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/VerticalSlabsModule.java @@ -111,7 +111,7 @@ public void postRegister(ZRegister.Post e) { @LoadEvent public final void setup(ZCommonSetup event) { - verticalSlabTag = Quark.asTagKey(Registries.BLOCK,"vertical_slabs"); + verticalSlabTag = Quark.asTagKey(Registries.BLOCK, "vertical_slabs"); } @LoadEvent diff --git a/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java b/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java index 57f4799d68..16934788c2 100644 --- a/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java +++ b/src/main/java/org/violetmoon/quark/content/building/module/WoodenPostsModule.java @@ -1,6 +1,7 @@ package org.violetmoon.quark.content.building.module; import net.minecraft.core.registries.Registries; +import net.neoforged.neoforge.common.ItemAbilities; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.content.building.block.WoodPostBlock; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -21,8 +22,6 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LanternBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraftforge.common.ToolActions; @ZetaLoadModule(category = "building") public class WoodenPostsModule extends ZetaModule { @@ -37,13 +36,13 @@ public final void register(ZRegister event) { WoodPostBlock post = new WoodPostBlock(this, b, "", wood.soundWood()); WoodPostBlock stripped = new WoodPostBlock(this, b, "stripped_", wood.soundWood()); - ToolInteractionHandler.registerInteraction(ToolActions.AXE_STRIP, post, stripped); + ToolInteractionHandler.registerInteraction(ItemAbilities.AXE_STRIP, post, stripped); } } @LoadEvent public final void setup(ZCommonSetup event) { - postsTag = Quark.asTagKey(Registries.ITEM,"posts"); + postsTag = Quark.asTagKey(Registries.ITEM, "posts"); } public static boolean canHangingBlockConnect(BlockState state, LevelReader worldIn, BlockPos pos, boolean prev) { diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java index 8a04ad4c7e..2dd186ba17 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Crab.java @@ -416,7 +416,7 @@ public boolean isFood(ItemStack stack) { private Ingredient getTemptationItems() { if(temptationItems == null) temptationItems = Ingredient.of( - Quark.asTagKey(Registries.ITEM,"crab_tempt_items")); + Quark.asTagKey(Registries.ITEM, "crab_tempt_items")); return temptationItems; } diff --git a/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java b/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java index ad2103dfec..e450c82110 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/entity/Foxhound.java @@ -81,7 +81,7 @@ public class Foxhound extends Wolf implements Enemy { - public static final ResourceKey FOXHOUND_LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE,"entities/foxhound"); + public static final ResourceKey FOXHOUND_LOOT_TABLE = Quark.asResourceKey(Registries.LOOT_TABLE, "entities/foxhound"); private static final EntityDataAccessor TEMPTATION = SynchedEntityData.defineId(Foxhound.class, EntityDataSerializers.BOOLEAN); private static final EntityDataAccessor IS_BLUE = SynchedEntityData.defineId(Foxhound.class, EntityDataSerializers.BOOLEAN);