From 61246a7eff830c625bb9b8ea9b329d6675a0ff13 Mon Sep 17 00:00:00 2001 From: Shrish Deshpande Date: Fri, 9 Dec 2022 11:11:38 +0530 Subject: [PATCH] start 1.19.3 --- build.gradle | 40 +++++++------------ gradle.properties | 18 ++++----- .../org/dimdev/dimdoors/world/ModBiomes.java | 24 ++++++----- .../dimdoors/world/feature/ModFeatures.java | 9 ++--- src/main/resources/dimdoors.accesswidener | 2 +- 5 files changed, 42 insertions(+), 51 deletions(-) diff --git a/build.gradle b/build.gradle index df63b9f4..9bca6a08 100644 --- a/build.gradle +++ b/build.gradle @@ -123,40 +123,30 @@ loom { assemble.dependsOn runDatagen dependencies { - minecraft "com.mojang:minecraft:1.19.2" - mappings "net.fabricmc:yarn:1.19.2+build.8:v2" - modImplementation "net.fabricmc:fabric-loader:0.14.9" - modImplementation "net.fabricmc.fabric-api:fabric-api:0.60.0+1.19.2" + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_version}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + includeCompile("com.flowpowered", "flow-math", "1.0.3") includeCompile("org.jgrapht", "jgrapht-core", "1.1.0") includeCompile("com.github.DimensionalDevelopment", "poly2tri.java", "0.1.1") includeCompile("com.github.DimensionalDevelopment", "Matrix", "1.0.0") - includeCompile("me.shedaniel.cloth", "cloth-config-fabric", "7.0.72") + includeCompile("me.shedaniel.cloth", "cloth-config-fabric", "${project.cloth_config_version}") + includeCompile("dev.onyxstudios.cardinal-components-api", "cardinal-components-base", "${project.cardinal_components_version}") + includeCompile("dev.onyxstudios.cardinal-components-api", "cardinal-components-item", "${project.cardinal_components_version}") + includeCompile("dev.onyxstudios.cardinal-components-api", "cardinal-components-entity", "${project.cardinal_components_version}") + includeCompile("dev.onyxstudios.cardinal-components-api", "cardinal-components-level", "${project.cardinal_components_version}") + includeCompile("dev.onyxstudios.cardinal-components-api", "cardinal-components-world", "${project.cardinal_components_version}") + includeCompile("dev.onyxstudios.cardinal-components-api", "cardinal-components-chunk", "${project.cardinal_components_version}") - includeCompile("curse.maven", "cardinal_base-318449", "${project.cardinal_components_base}") - includeCompile("curse.maven", "cardinal_item-318449", "${project.cardinal_components_item}") - includeCompile("curse.maven", "cardinal_entity-318449", "${project.cardinal_components_entity}") - includeCompile("curse.maven", "cardinal_level-318449", "${project.cardinal_components_level}") - includeCompile("curse.maven", "cardinal_world-318449", "${project.cardinal_components_world}") - includeCompile("curse.maven", "cardinal_chunk-318449", "${project.cardinal_components_chunk}") - - //includeCompile("curse.maven", "wthit-3707010", "${project.wthit}") - - modCompileOnly("com.terraformersmc:modmenu:4.0.0") { + modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}") { exclude module: "fabric-api" } - -// modCompileOnly("mcp.mobius.waila:wthit:fabric-4.8.0") { -// exclude module: "modmenu" -// exclude module: "fabric-api" -// } - - modCompileOnly "curse.maven:worldedit-225608:3836903" - modCompileOnly "curse.maven:wthit-440979:3841975" + modCompileOnly "curse.maven:worldedit-225608:${project.worldedit_version}" + modCompileOnly "curse.maven:wthit-440979:${project.wthit_version}" testImplementation('org.junit.jupiter:junit-jupiter:5.8.2') -// testImplementation("junit:junit:4.13.2") -// testImplementation("net.devtech:PotatoUnit:1.0.2") } version = computeVersion(project.mod_version) + "-" + project.minecraft_version diff --git a/gradle.properties b/gradle.properties index c8a6834c..72c6b905 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ mod_version=5.0.1 -minecraft_version=1.19.2 +minecraft_version=1.19.3 +yarn_version=1.19.3+build.2 +loader_version=0.14.11 +fabric_version=0.68.1+1.19.3 org.gradle.jvmargs=-Xmx2048m -cardinal_components_base=3801039 -cardinal_components_item=3801043 -cardinal_components_entity=3801042 -cardinal_components_level=3801044 -cardinal_components_world=3801046 -cardinal_components_chunk=3801041 - -wthit=3841975 +cardinal_components_version=5.0.2 +modmenu_version=5.0.1 +cloth_config_version=9.0.93 +wthit_version=4145268 +worldedit_version=3922622 diff --git a/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java b/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java index 98b872a8..8ab5992a 100644 --- a/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java +++ b/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java @@ -7,11 +7,11 @@ import org.dimdev.dimdoors.sound.ModSoundEvents; import org.dimdev.dimdoors.world.feature.ModFeatures; import net.minecraft.entity.SpawnGroup; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.BiomeMoodSound; import net.minecraft.sound.MusicSound; -import net.minecraft.util.registry.BuiltinRegistries; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.biome.BiomeParticleConfig; @@ -19,6 +19,8 @@ import net.minecraft.world.biome.GenerationSettings; import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.gen.GenerationStep; +import static org.dimdev.dimdoors.DimensionalDoors.id; + public final class ModBiomes { public static final RegistryKey PERSONAL_WHITE_VOID_KEY; public static final RegistryKey PUBLIC_BLACK_VOID_KEY; @@ -30,10 +32,10 @@ public final class ModBiomes { public static final Biome LIMBO_BIOME; public static void init() { - Registry.register(BuiltinRegistries.BIOME, LIMBO_KEY.getValue(), LIMBO_BIOME); - Registry.register(BuiltinRegistries.BIOME, PERSONAL_WHITE_VOID_KEY.getValue(), PERSONAL_WHITE_VOID_BIOME); - Registry.register(BuiltinRegistries.BIOME, PUBLIC_BLACK_VOID_KEY.getValue(), PUBLIC_BLACK_VOID_BIOME); - Registry.register(BuiltinRegistries.BIOME, DUNGEON_DANGEROUS_BLACK_VOID_KEY.getValue(), DUNGEON_DANGEROUS_BLACK_VOID_BIOME); +// Registry.register(BuiltinRegistries.BIOME, LIMBO_KEY.getValue(), LIMBO_BIOME); +// Registry.register(BuiltinRegistries.BIOME, PERSONAL_WHITE_VOID_KEY.getValue(), PERSONAL_WHITE_VOID_BIOME); +// Registry.register(BuiltinRegistries.BIOME, PUBLIC_BLACK_VOID_KEY.getValue(), PUBLIC_BLACK_VOID_BIOME); +// Registry.register(BuiltinRegistries.BIOME, DUNGEON_DANGEROUS_BLACK_VOID_KEY.getValue(), DUNGEON_DANGEROUS_BLACK_VOID_BIOME); // only ever needed if the biome api is broken // BuiltinBiomesAccessor.getIdMap().put(BuiltinRegistries.BIOME.getRawId(LIMBO_BIOME), LIMBO_KEY); // BuiltinBiomesAccessor.getIdMap().put(BuiltinRegistries.BIOME.getRawId(PERSONAL_WHITE_VOID_BIOME), PERSONAL_WHITE_VOID_KEY); @@ -64,10 +66,10 @@ public final class ModBiomes { .spawnSettings(new SpawnSettings.Builder().build()) .temperature(0.8f) .temperatureModifier(Biome.TemperatureModifier.NONE); - PERSONAL_WHITE_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, DimensionalDoors.id("white_void")); - PUBLIC_BLACK_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, DimensionalDoors.id("black_void")); - DUNGEON_DANGEROUS_BLACK_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, DimensionalDoors.id("dangerous_black_void")); - LIMBO_KEY = RegistryKey.of(Registry.BIOME_KEY, DimensionalDoors.id("limbo")); + PERSONAL_WHITE_VOID_KEY = RegistryKey.of(RegistryKeys.BIOME, id("white_void")); + PUBLIC_BLACK_VOID_KEY = RegistryKey.of(RegistryKeys.BIOME, id("black_void")); + DUNGEON_DANGEROUS_BLACK_VOID_KEY = RegistryKey.of(RegistryKeys.BIOME, id("dangerous_black_void")); + LIMBO_KEY = RegistryKey.of(RegistryKeys.BIOME, id("limbo")); PERSONAL_WHITE_VOID_BIOME = voidBiomeBuilder.effects(createEffect(true)).build(); PUBLIC_BLACK_VOID_BIOME = voidBiomeBuilder.effects(createEffect(false)).build(); DUNGEON_DANGEROUS_BLACK_VOID_BIOME = voidBiomeBuilder.effects(createEffect(false)).build(); diff --git a/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java b/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java index c6bb569c..092fdc64 100644 --- a/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java +++ b/src/main/java/org/dimdev/dimdoors/world/feature/ModFeatures.java @@ -4,10 +4,9 @@ import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags; import net.minecraft.block.Block; import net.minecraft.fluid.Fluids; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.structure.rule.BlockMatchRuleTest; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryEntry; -import net.minecraft.util.registry.RegistryEntryList; import net.minecraft.world.biome.BiomeKeys; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.YOffset; @@ -28,8 +27,8 @@ public final class ModFeatures { public static final SchematicGateway TWO_PILLARS_GATEWAY = new TwoPillarsGateway(); public static final SchematicGateway END_GATEWAY = new EndGateway(); - public static final Feature SCHEMATIC_GATEWAY_FEATURE = Registry.register(Registry.FEATURE, DimensionalDoors.id("schematic_gateway"), new SchematicGatewayFeature(SchematicGatewayFeatureConfig.CODEC)); - public static final Feature LIMBO_GATEWAY_FEATURE = Registry.register(Registry.FEATURE, DimensionalDoors.id("limbo_gateway"), new LimboGatewayFeature()); + public static final Feature SCHEMATIC_GATEWAY_FEATURE = Registry.register(Registries.FEATURE, DimensionalDoors.id("schematic_gateway"), new SchematicGatewayFeature(SchematicGatewayFeatureConfig.CODEC)); + public static final Feature LIMBO_GATEWAY_FEATURE = Registry.register(Registries.FEATURE, DimensionalDoors.id("limbo_gateway"), new LimboGatewayFeature()); public static void init() { SANDSTONE_PILLARS_GATEWAY.init(); diff --git a/src/main/resources/dimdoors.accesswidener b/src/main/resources/dimdoors.accesswidener index 6dab07aa..b50cb75f 100644 --- a/src/main/resources/dimdoors.accesswidener +++ b/src/main/resources/dimdoors.accesswidener @@ -3,7 +3,7 @@ accessWidener v1 named # Because its package private accessible class net/minecraft/client/render/RenderLayer$MultiPhase accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters -accessible class net/minecraft/client/render/RenderPhase$Shader +accessible class net/minecraft/client/render/RenderPhase$ShaderProgram accessible class net/minecraft/client/render/RenderPhase$Textures accessible method net/minecraft/entity/Entity setRotation (FF)V