mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-17 22:31:52 +00:00
dont use vanilla registries
This commit is contained in:
@@ -3,7 +3,6 @@ import net.minecraftforge.gradle.common.util.RunConfig
|
|||||||
import net.minecraftforge.gradle.mcp.task.GenerateSRG
|
import net.minecraftforge.gradle.mcp.task.GenerateSRG
|
||||||
import net.minecraftforge.gradle.userdev.UserDevExtension
|
import net.minecraftforge.gradle.userdev.UserDevExtension
|
||||||
import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
|
import net.minecraftforge.gradle.userdev.tasks.RenameJarInPlace
|
||||||
import java.util.Date
|
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
@@ -21,11 +20,12 @@ apply(plugin = "net.minecraftforge.gradle")
|
|||||||
apply(plugin = "org.spongepowered.mixin")
|
apply(plugin = "org.spongepowered.mixin")
|
||||||
|
|
||||||
configure<org.spongepowered.asm.gradle.plugins.MixinExtension> {
|
configure<org.spongepowered.asm.gradle.plugins.MixinExtension> {
|
||||||
add(sourceSets.main.orNull, "terra.refmap.json")
|
add(sourceSets.main.get(), "terra.refmap.json")
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
|
id("com.modrinth.minotaur").version("1.1.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
configureCommon()
|
configureCommon()
|
||||||
@@ -47,7 +47,7 @@ dependencies {
|
|||||||
"annotationProcessor"("org.spongepowered:mixin:0.8.2:processor")
|
"annotationProcessor"("org.spongepowered:mixin:0.8.2:processor")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (System.getProperty("idea.sync.active") == "true") {
|
if ("true" == System.getProperty("idea.sync.active")) {
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
tasks.withType<JavaCompile>().all {
|
tasks.withType<JavaCompile>().all {
|
||||||
options.annotationProcessorPath = files()
|
options.annotationProcessorPath = files()
|
||||||
@@ -58,6 +58,7 @@ if (System.getProperty("idea.sync.active") == "true") {
|
|||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
val reobf = extensions.getByName<NamedDomainObjectContainer<RenameJarInPlace>>("reobf")
|
val reobf = extensions.getByName<NamedDomainObjectContainer<RenameJarInPlace>>("reobf")
|
||||||
reobf.maybeCreate("shadowJar").run {
|
reobf.maybeCreate("shadowJar").run {
|
||||||
|
group = "forge"
|
||||||
mappings = tasks.getByName<GenerateSRG>("createMcpToSrg").output
|
mappings = tasks.getByName<GenerateSRG>("createMcpToSrg").output
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,6 +86,7 @@ configure<UserDevExtension> {
|
|||||||
tasks.register<Jar>("deobfJar") {
|
tasks.register<Jar>("deobfJar") {
|
||||||
from(sourceSets["main"].output)
|
from(sourceSets["main"].output)
|
||||||
archiveClassifier.set("dev")
|
archiveClassifier.set("dev")
|
||||||
|
group = "forge"
|
||||||
}
|
}
|
||||||
|
|
||||||
val deobfElements = configurations.register("deobfElements") {
|
val deobfElements = configurations.register("deobfElements") {
|
||||||
@@ -119,4 +121,8 @@ tasks.jar {
|
|||||||
"MixinConfigs" to "terra.mixins.json"
|
"MixinConfigs" to "terra.mixins.json"
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named("shadowJar") {
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -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.api.platform.inventory.item.Enchantment;
|
||||||
import com.dfsek.terra.forge.world.ForgeAdapter;
|
import com.dfsek.terra.forge.world.ForgeAdapter;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@@ -26,7 +27,7 @@ public class ForgeEnchantment implements Enchantment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getID() {
|
public String getID() {
|
||||||
return Objects.requireNonNull(Registry.ENCHANTMENT.getKey(enchantment)).toString();
|
return Objects.requireNonNull(ForgeRegistries.ENCHANTMENTS.getKey(enchantment)).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
|||||||
import net.minecraft.command.arguments.ItemArgument;
|
import net.minecraft.command.arguments.ItemArgument;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -26,11 +27,11 @@ public class ForgeItemHandle implements ItemHandle {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Enchantment getEnchantment(String id) {
|
public Enchantment getEnchantment(String id) {
|
||||||
return ForgeAdapter.adapt(Registry.ENCHANTMENT.get(ResourceLocation.tryParse(id)));
|
return ForgeAdapter.adapt(ForgeRegistries.ENCHANTMENTS.getValue(ResourceLocation.tryParse(id)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<Enchantment> getEnchantments() {
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
package com.dfsek.terra.forge.mixin;
|
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.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.Mixin;
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
|
||||||
@@ -33,19 +28,4 @@ public interface BiomeAmbienceAccessor {
|
|||||||
|
|
||||||
@Accessor
|
@Accessor
|
||||||
BiomeAmbience.GrassColorModifier getGrassColorModifier();
|
BiomeAmbience.GrassColorModifier getGrassColorModifier();
|
||||||
|
|
||||||
@Accessor
|
|
||||||
Optional<ParticleEffectAmbience> getAmbientParticleSettings();
|
|
||||||
|
|
||||||
@Accessor
|
|
||||||
Optional<SoundEvent> getAmbientLoopSoundEvent();
|
|
||||||
|
|
||||||
@Accessor
|
|
||||||
Optional<MoodSoundAmbience> getAmbientMoodSettings();
|
|
||||||
|
|
||||||
@Accessor
|
|
||||||
Optional<SoundAdditionsAmbience> getAmbientAdditionsSettings();
|
|
||||||
|
|
||||||
@Accessor
|
|
||||||
Optional<BackgroundMusicSelector> getBackgroundMusic();
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import net.minecraft.block.BlockState;
|
|||||||
import net.minecraft.command.arguments.BlockStateParser;
|
import net.minecraft.command.arguments.BlockStateParser;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
@@ -30,6 +31,6 @@ public class ForgeWorldHandle implements WorldHandle {
|
|||||||
public EntityType getEntity(String id) {
|
public EntityType getEntity(String id) {
|
||||||
ResourceLocation identifier = ResourceLocation.tryParse(id);
|
ResourceLocation identifier = ResourceLocation.tryParse(id);
|
||||||
if(identifier == null) identifier = ResourceLocation.tryParse("minecraft:" + id.toLowerCase(Locale.ROOT));
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -8,6 +8,7 @@ import com.dfsek.terra.forge.world.ForgeAdapter;
|
|||||||
import net.minecraft.tileentity.MobSpawnerTileEntity;
|
import net.minecraft.tileentity.MobSpawnerTileEntity;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
import net.minecraft.world.IWorld;
|
import net.minecraft.world.IWorld;
|
||||||
|
import net.minecraftforge.registries.ForgeRegistries;
|
||||||
import org.jetbrains.annotations.NotNull;
|
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
|
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
|
@Override
|
||||||
public EntityType getSpawnedType() {
|
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
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user