From 9956cab5074d8a9f16d1886fd90daf719bd8e9a1 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 1 May 2021 22:21:27 -0700 Subject: [PATCH] dont use vanilla registries --- platforms/forge/build.gradle.kts | 12 ++++++++--- .../forge/inventory/ForgeEnchantment.java | 3 ++- .../forge/inventory/ForgeItemHandle.java | 5 +++-- .../forge/mixin/BiomeAmbienceAccessor.java | 20 ------------------- .../terra/forge/world/ForgeWorldHandle.java | 3 ++- .../world/block/state/ForgeMobSpawner.java | 3 ++- 6 files changed, 18 insertions(+), 28 deletions(-) diff --git a/platforms/forge/build.gradle.kts b/platforms/forge/build.gradle.kts index 6585d3f61..0d2454aff 100644 --- a/platforms/forge/build.gradle.kts +++ b/platforms/forge/build.gradle.kts @@ -3,7 +3,6 @@ import net.minecraftforge.gradle.common.util.RunConfig import net.minecraftforge.gradle.mcp.task.GenerateSRG import net.minecraftforge.gradle.userdev.UserDevExtension import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace -import java.util.Date buildscript { repositories { @@ -21,11 +20,12 @@ apply(plugin = "net.minecraftforge.gradle") apply(plugin = "org.spongepowered.mixin") configure { - add(sourceSets.main.orNull, "terra.refmap.json") + add(sourceSets.main.get(), "terra.refmap.json") } plugins { java + id("com.modrinth.minotaur").version("1.1.0") } configureCommon() @@ -47,7 +47,7 @@ dependencies { "annotationProcessor"("org.spongepowered:mixin:0.8.2:processor") } -if (System.getProperty("idea.sync.active") == "true") { +if ("true" == System.getProperty("idea.sync.active")) { afterEvaluate { tasks.withType().all { options.annotationProcessorPath = files() @@ -58,6 +58,7 @@ if (System.getProperty("idea.sync.active") == "true") { afterEvaluate { val reobf = extensions.getByName>("reobf") reobf.maybeCreate("shadowJar").run { + group = "forge" mappings = tasks.getByName("createMcpToSrg").output } } @@ -85,6 +86,7 @@ configure { tasks.register("deobfJar") { from(sourceSets["main"].output) archiveClassifier.set("dev") + group = "forge" } val deobfElements = configurations.register("deobfElements") { @@ -119,4 +121,8 @@ tasks.jar { "MixinConfigs" to "terra.mixins.json" )) } +} + +tasks.named("shadowJar") { + } \ No newline at end of file diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeEnchantment.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeEnchantment.java index 8b0110ffa..8517c7118 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeEnchantment.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeEnchantment.java @@ -4,6 +4,7 @@ import com.dfsek.terra.api.platform.inventory.ItemStack; import com.dfsek.terra.api.platform.inventory.item.Enchantment; import com.dfsek.terra.forge.world.ForgeAdapter; import net.minecraft.util.registry.Registry; +import net.minecraftforge.registries.ForgeRegistries; import java.util.Objects; @@ -26,7 +27,7 @@ public class ForgeEnchantment implements Enchantment { @Override public String getID() { - return Objects.requireNonNull(Registry.ENCHANTMENT.getKey(enchantment)).toString(); + return Objects.requireNonNull(ForgeRegistries.ENCHANTMENTS.getKey(enchantment)).toString(); } @Override diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeItemHandle.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeItemHandle.java index 041cab37b..6639b4a59 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeItemHandle.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeItemHandle.java @@ -9,6 +9,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.command.arguments.ItemArgument; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; +import net.minecraftforge.registries.ForgeRegistries; import java.util.Set; import java.util.stream.Collectors; @@ -26,11 +27,11 @@ public class ForgeItemHandle implements ItemHandle { @Override public Enchantment getEnchantment(String id) { - return ForgeAdapter.adapt(Registry.ENCHANTMENT.get(ResourceLocation.tryParse(id))); + return ForgeAdapter.adapt(ForgeRegistries.ENCHANTMENTS.getValue(ResourceLocation.tryParse(id))); } @Override public Set getEnchantments() { - return Registry.ENCHANTMENT.stream().map(ForgeAdapter::adapt).collect(Collectors.toSet()); + return ForgeRegistries.ENCHANTMENTS.getEntries().stream().map(entry -> ForgeAdapter.adapt(entry.getValue())).collect(Collectors.toSet()); } } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java index bfbe7baa3..1474a33e0 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java @@ -1,11 +1,6 @@ package com.dfsek.terra.forge.mixin; -import net.minecraft.client.audio.BackgroundMusicSelector; -import net.minecraft.util.SoundEvent; import net.minecraft.world.biome.BiomeAmbience; -import net.minecraft.world.biome.MoodSoundAmbience; -import net.minecraft.world.biome.ParticleEffectAmbience; -import net.minecraft.world.biome.SoundAdditionsAmbience; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -33,19 +28,4 @@ public interface BiomeAmbienceAccessor { @Accessor BiomeAmbience.GrassColorModifier getGrassColorModifier(); - - @Accessor - Optional getAmbientParticleSettings(); - - @Accessor - Optional getAmbientLoopSoundEvent(); - - @Accessor - Optional getAmbientMoodSettings(); - - @Accessor - Optional getAmbientAdditionsSettings(); - - @Accessor - Optional getBackgroundMusic(); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/world/ForgeWorldHandle.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/world/ForgeWorldHandle.java index 9d3cc5914..8e4cfafe6 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/world/ForgeWorldHandle.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/world/ForgeWorldHandle.java @@ -9,6 +9,7 @@ import net.minecraft.block.BlockState; import net.minecraft.command.arguments.BlockStateParser; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; +import net.minecraftforge.registries.ForgeRegistries; import java.util.Locale; @@ -30,6 +31,6 @@ public class ForgeWorldHandle implements WorldHandle { public EntityType getEntity(String id) { ResourceLocation identifier = ResourceLocation.tryParse(id); if(identifier == null) identifier = ResourceLocation.tryParse("minecraft:" + id.toLowerCase(Locale.ROOT)); - return ForgeAdapter.adapt(Registry.ENTITY_TYPE.get(identifier)); + return ForgeAdapter.adapt(ForgeRegistries.ENTITIES.getValue(identifier)); } } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/world/block/state/ForgeMobSpawner.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/world/block/state/ForgeMobSpawner.java index 0cda8e206..95ca3d941 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/world/block/state/ForgeMobSpawner.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/world/block/state/ForgeMobSpawner.java @@ -8,6 +8,7 @@ import com.dfsek.terra.forge.world.ForgeAdapter; import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.util.registry.Registry; import net.minecraft.world.IWorld; +import net.minecraftforge.registries.ForgeRegistries; import org.jetbrains.annotations.NotNull; public class ForgeMobSpawner extends ForgeBlockState implements MobSpawner { // TODO: finish implementation / refactor API because bukkit doesnt expose most of the stuff spawners can do @@ -19,7 +20,7 @@ public class ForgeMobSpawner extends ForgeBlockState implements MobSpawner { // @Override public EntityType getSpawnedType() { - return ForgeAdapter.adapt(Registry.ENTITY_TYPE.get(((MobSpawnerTileEntity) blockEntity).getSpawner().getSpawnerEntity().getType().getRegistryName())); + return ForgeAdapter.adapt(ForgeRegistries.ENTITIES.getValue(((MobSpawnerTileEntity) blockEntity).getSpawner().getSpawnerEntity().getType().getRegistryName())); } @Override