mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-11 18:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

dont use vanilla registries

Browse Source
This commit is contained in:
dfsek
2021-05-01 22:21:27 -07:00
parent fddf0c51b7
commit 9956cab507
6 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platforms/forge/build.gradle.kts
View File

@@ -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<org.spongepowered.asm.gradle.plugins.MixinExtension> {
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<JavaCompile>().all {
options.annotationProcessorPath = files()
@@ -58,6 +58,7 @@ if (System.getProperty("idea.sync.active") == "true") {
afterEvaluate {
val reobf = extensions.getByName<NamedDomainObjectContainer<RenameJarInPlace>>("reobf")
reobf.maybeCreate("shadowJar").run {
group = "forge"
mappings = tasks.getByName<GenerateSRG>("createMcpToSrg").output
}
}
@@ -85,6 +86,7 @@ configure<UserDevExtension> {
tasks.register<Jar>("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") {
}

3
platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeEnchantment.java
View File

@@ -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

5
platforms/forge/src/main/java/com/dfsek/terra/forge/inventory/ForgeItemHandle.java
View File

@@ -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<Enchantment> 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());
}
}

20
platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/BiomeAmbienceAccessor.java
View File

@@ -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<ParticleEffectAmbience> getAmbientParticleSettings();
@Accessor
Optional<SoundEvent> getAmbientLoopSoundEvent();
@Accessor
Optional<MoodSoundAmbience> getAmbientMoodSettings();
@Accessor
Optional<SoundAdditionsAmbience> getAmbientAdditionsSettings();
@Accessor
Optional<BackgroundMusicSelector> getBackgroundMusic();
}

3
platforms/forge/src/main/java/com/dfsek/terra/forge/world/ForgeWorldHandle.java
View File

@@ -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));
}
}

3
platforms/forge/src/main/java/com/dfsek/terra/forge/world/block/state/ForgeMobSpawner.java
View File

@@ -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