Skip to content

Commit 56dca86

Browse files
UnRealDinnerboneUnRealDinnerbone
committed
Update to 1.20.4
1 parent 6b4f51d commit 56dca86

File tree

30 files changed

+363
-130
lines changed

30 files changed

+363
-130
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ eclipse
2323
run
2424

2525
Fabric/run_client/
26+
27+
neo/runs/

‎build.gradle

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
import dev.nanite.mlp.tasks.SingleOutputJar
2-
31
plugins {
4-
id("dev.nanite.mlp") version("0.0.3")
5-
id("java")
6-
id "me.modmuss50.mod-publish-plugin" version "0.3.0"
7-
8-
id("fabric-loom") version("1.3.9") apply(false)
9-
id("net.minecraftforge.gradle") version("6.0.+") apply(false)
2+
id("dev.nanite.mlp") version("0.1.1-SNAPSHOT")
3+
id("java-library")
4+
id("maven-publish")
5+
id("me.modmuss50.mod-publish-plugin") version "0.3.0"
106
}
117

8+
129
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
1310

1411
multiLoader.root() {
1512
minecraftVersion.set(project.property("minecraft_version"))
1613
modID.set(project.property("mod_id"))
1714
splitSources.set(true)
15+
convertAccessWidener.set(true)
1816
accessWidenerFile.set(project(":common").file("src/main/resources/${mod_id}.accesswidener"))
1917
}
2018

@@ -23,17 +21,20 @@ allprojects {
2321
version = "${mod_version}+mc${minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
2422
setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
2523
group = "com.unrealdinnerbone"
26-
}
2724

2825

26+
}
27+
2928
subprojects {
30-
apply plugin: 'dev.nanite.mlp'
29+
30+
31+
apply plugin: 'java-library'
3132
apply plugin: 'maven-publish'
33+
apply plugin: 'dev.nanite.mlp'
3234

3335

3436
sourceSets.main.resources.srcDir project.file('src/generated/resources')
3537

36-
3738
base {
3839
archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
3940
}
@@ -84,31 +85,50 @@ publishMods {
8485

8586
def fabricOptions = publishOptions {
8687
file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
87-
displayName = "${project.name} Fabric ${mod_version}+mc${minecraft_version}"
88+
displayName = "[FABRIC][${minecraft_version}] ${project.name} ${mod_version}"
8889
modLoaders.add("fabric")
8990
}
9091

9192
def forgeOptions = publishOptions {
92-
file = project.provider { project(":forge").tasks.jarJar }.flatMap { it.archiveFile }
93-
displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
93+
file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
94+
displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
9495
modLoaders.add("forge")
9596
}
9697

98+
def neoForge = publishOptions {
99+
file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
100+
displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
101+
modLoaders.add("neoforge")
102+
}
103+
97104
def curseForgeOptions = curseforgeOptions {
98105
accessToken = providers.environmentVariable("CURSE_TOKEN")
99-
projectId = project.property("curse_id")
106+
projectId = "${curseforge_id}"
100107
minecraftVersions.add("${minecraft_version}")
101108
}
102109

103110
curseforge("curseforgeFabric") {
104111
from(curseForgeOptions, fabricOptions)
112+
requires {
113+
slug = "architectury-api"
114+
}
105115
requires {
106116
slug = "fabric-api"
107117
}
108118
}
109119

110120
curseforge("curseforgeForge") {
111121
from(curseForgeOptions, forgeOptions)
122+
requires {
123+
slug = "architectury-api"
124+
}
125+
}
126+
127+
curseforge("curseforgeNeoForge") {
128+
from(curseForgeOptions, neoForge)
129+
requires {
130+
slug = "architectury-api"
131+
}
112132
}
113133

114134
}

‎common/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,3 @@ multiLoader.common()
33
publishing.publications.mavenJava.from components.java
44

55

6-
dependencies {
7-
api ("com.unrealdinnerbone:UnRealConfig-gson:${unreal_config_version}") {
8-
exclude group: 'com.google.code.gson', module: 'gson'
9-
exclude group: 'org.jetbrains', module: 'annotations'
10-
exclude group: 'org.slf4j', module: 'slf4j-api'
11-
12-
}
13-
}
14-

‎common/src/main/java/com/unrealdinnerbone/trenzalore/TestItems.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.unrealdinnerbone.trenzalore;
2+
3+
import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry;
4+
import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry;
5+
import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects;
6+
import net.minecraft.core.registries.BuiltInRegistries;
7+
import net.minecraft.core.registries.Registries;
8+
import net.minecraft.world.item.Item;
9+
10+
import java.util.List;
11+
12+
public class TestItems implements IRegistry {
13+
14+
private static final RegistryObjects<Item> ITEMS = RegistryObjects.of(Registries.ITEM);
15+
16+
public static final RegistryEntry<Item> TEST_ITEM = ITEMS.register("test_item", () -> new Item(new Item.Properties()));
17+
@Override
18+
public List<RegistryObjects<?>> getRegistryObjects() {
19+
return List.of(ITEMS);
20+
}
21+
22+
@Override
23+
public String getModID() {
24+
return Trenzalore.MOD_ID;
25+
}
26+
}

‎common/src/main/java/com/unrealdinnerbone/trenzalore/api/config/ConfigManger.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;
55
import com.mojang.logging.LogUtils;
6-
import com.unrealdinnerbone.config.ConfigManager;
7-
import com.unrealdinnerbone.config.gson.GsonProvider;
86
import com.unrealdinnerbone.trenzalore.api.platform.Services;
97
import org.jetbrains.annotations.ApiStatus;
108
import org.slf4j.Logger;
@@ -21,7 +19,7 @@ public class ConfigManger {
2119
private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
2220

2321
@Deprecated
24-
@ApiStatus.ScheduledForRemoval(inVersion = "4.0.0")
22+
@ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
2523
public static <T> T getOrCreateConfig(String name, Class<T> tClass, Supplier<T> defaultValue) {
2624
Path configPath = Services.PLATFORM.getConfigPath();
2725
Path config = configPath.resolve(name + ".json");
@@ -42,10 +40,4 @@ public static <T> T getOrCreateConfig(String name, Class<T> tClass, Supplier<T>
4240
}
4341
}
4442

45-
public static ConfigManager createConfigManager(String modid) {
46-
Path configPath = Services.PLATFORM.getConfigPath();
47-
Path config = configPath.resolve(modid + ".json");
48-
return new ConfigManager(new GsonProvider(config, GSON));
49-
}
50-
5143
}

‎common/src/main/java/com/unrealdinnerbone/trenzalore/api/platform/services/IPlatformHelper.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import net.minecraft.resources.ResourceKey;
77
import net.minecraft.server.level.ServerLevel;
88
import net.minecraft.world.entity.Entity;
9-
import net.minecraft.world.entity.player.Player;
109
import net.minecraft.world.item.CreativeModeTab;
1110
import net.minecraft.world.item.Item;
1211
import net.minecraft.world.level.block.Block;
@@ -30,14 +29,9 @@ public interface IPlatformHelper {
3029

3130
boolean isModLoaded(String modId);
3231

33-
@Nullable
34-
default <T extends Entity> Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) {
35-
return teleportInternal(entity, level, portalInfo);
36-
}
37-
3832
@Nullable
3933
@ApiStatus.Internal
40-
<T extends Entity> Entity teleportInternal(T entity, ServerLevel level, PortalInfo portalInfo);
34+
<T extends Entity> Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo);
4135
@ApiStatus.Internal
4236
void addItemToCreativeTab(ResourceKey<CreativeModeTab> tabResourceKey, List<Supplier<? extends Item>> item);
4337
@ApiStatus.Internal

‎common/src/main/java/com/unrealdinnerbone/trenzalore/api/registry/Regeneration.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.core.BlockPos;
77
import net.minecraft.core.Registry;
88
import net.minecraft.resources.ResourceKey;
9+
import net.minecraft.resources.ResourceLocation;
910
import net.minecraft.world.item.CreativeModeTab;
1011
import net.minecraft.world.item.Item;
1112
import net.minecraft.world.level.block.Block;
@@ -24,16 +25,9 @@ public static <T> RegistryObjects<T> create(ResourceKey<Registry<T>> registry) {
2425
return RegistryObjects.of(registry);
2526
}
2627

27-
public static <T extends CriterionTrigger<?>> T registerCriterion(T criterion) {
28-
return CriteriaTriggers.register(criterion);
28+
public static <T extends CriterionTrigger<?>> T registerCriterion(ResourceLocation name, T criterion) {
29+
return CriteriaTriggers.register(name.toString(), criterion);
2930
}
30-
31-
@Deprecated
32-
@ApiStatus.ScheduledForRemoval(inVersion = "4.0.0")
33-
public static void registerCreativeTabItems(ResourceKey<CreativeModeTab> tabResourceKey, List<Supplier<? extends Item>> item) {
34-
addItemsToCreateTab(tabResourceKey, item);
35-
}
36-
3731
public static void addItemToCreateTab(ResourceKey<CreativeModeTab> tabResourceKey, Supplier<? extends Item> item) {
3832
Services.PLATFORM.addItemToCreativeTab(tabResourceKey, List.of(item));
3933
}

‎common/src/main/java/com/unrealdinnerbone/trenzalore/api/registry/RegistryFactory.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎common/src/main/java/com/unrealdinnerbone/trenzalore/lib/CustomCodecs.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎common/src/main/resources/trenzalore.accesswidener

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
accessWidener v1 named
2-
accessible method net/minecraft/advancements/CriteriaTriggers register (Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
2+
accessible method net/minecraft/advancements/CriteriaTriggers register (Ljava/lang/String;Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
33
accessible field net/minecraft/world/item/CreativeModeTabs BUILDING_BLOCKS Lnet/minecraft/resources/ResourceKey;
44
accessible field net/minecraft/world/item/CreativeModeTabs COLORED_BLOCKS Lnet/minecraft/resources/ResourceKey;
55
accessible field net/minecraft/world/item/CreativeModeTabs NATURAL_BLOCKS Lnet/minecraft/resources/ResourceKey;

‎fabric/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ multiLoader.fabric() {
55

66
publishing.publications.mavenJava.from components.java
77

8-
9-
dependencies {
10-
include(api("com.unrealdinnerbone:UnRealConfig-gson:${unreal_config_version}"))
11-
include(implementation("com.unrealdinnerbone:UnRealConfig-core:${unreal_config_version}"))
12-
}
13-
148
remapJar {
159
setArchivesBaseName("${project.property("mod_name")}-${project.name}".toLowerCase())
1610
}

‎fabric/src/main/java/com/unrealdinnerbone/trenzalore/platform/FabricPlatformHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public <T> void registryRegistryObjects(String modId, RegistryObjects<T> registr
7474

7575
@Override
7676
@Nullable
77-
public <T extends Entity> Entity teleportInternal(T entity, ServerLevel level, PortalInfo portalInfo) {
77+
public <T extends Entity> Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) {
7878
return FabricDimensions.teleport(entity, level, portalInfo);
7979
}
8080

‎forge/build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
plugins {
2-
id("java-library")
3-
}
4-
51
multiLoader.forge() {
62
forgeVersion.set("${forge_version}")
73
}
@@ -17,19 +13,6 @@ publishing {
1713
}
1814
}
1915

20-
21-
dependencies {
22-
api ("com.unrealdinnerbone:UnRealConfig-gson:${unreal_config_version}")
23-
// minecraftEmbed()
24-
minecraftEmbed("com.unrealdinnerbone:UnRealConfig-gson:[${unreal_config_version}]") {
25-
transitive = false
26-
}
27-
minecraftEmbed("com.unrealdinnerbone:UnRealConfig-core:[${unreal_config_version}]") {
28-
transitive = false
29-
}
30-
}
31-
32-
3316
tasks.jarJar {
3417
finalizedBy("reobfJarJar")
3518
setArchivesBaseName("${project.property("mod_name")}-${project.name}".toLowerCase())

‎forge/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreForge.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.unrealdinnerbone.trenzalore;
22

3-
import com.unrealdinnerbone.config.ConfigManager;
4-
import com.unrealdinnerbone.config.config.BooleanConfig;
53
import com.unrealdinnerbone.trenzalore.platform.ForgePlatformHelper;
64
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
75
import net.minecraftforge.fml.common.Mod;

‎forge/src/main/java/com/unrealdinnerbone/trenzalore/events/ReplaceItemModifier.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5-
import com.unrealdinnerbone.trenzalore.lib.CustomCodecs;
65
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
7-
import net.minecraft.nbt.CompoundTag;
86
import net.minecraft.world.item.ItemStack;
97
import net.minecraft.world.item.crafting.Ingredient;
108
import net.minecraft.world.level.storage.loot.LootContext;
@@ -19,7 +17,7 @@ public class ReplaceItemModifier extends LootModifier {
1917
private final ItemStack stack;
2018
public static final Codec<ReplaceItemModifier> CODEC = RecordCodecBuilder.create(builder ->
2119
codecStart(builder)
22-
.and(CustomCodecs.INGREDIENT.fieldOf("item")
20+
.and(Ingredient.CODEC.fieldOf("item")
2321
.forGetter((modifier) -> modifier.ingredient))
2422
.and(ItemStack.CODEC.fieldOf("stack")
2523
.forGetter((modifier) -> modifier.stack))

‎forge/src/main/java/com/unrealdinnerbone/trenzalore/platform/ForgePlatformHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void addItemToCreativeTab(ResourceKey<CreativeModeTab> tabResourceKey, Li
6969
}
7070

7171
@Override
72-
public @Nullable <T extends Entity> Entity teleportInternal(T entity, ServerLevel level, PortalInfo portalInfo) {
72+
public @Nullable <T extends Entity> Entity teleport(T entity, ServerLevel level, PortalInfo portalInfo) {
7373
return entity.changeDimension(level, new SimpleTeleporter(portalInfo));
7474
}
7575
public record SimpleTeleporter(PortalInfo portalInfo) implements ITeleporter {

‎forge/src/main/resources/META-INF/accesstransformer.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
public net.minecraft.advancements.CriteriaTriggers m_10595_(Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
1+
public net.minecraft.advancements.CriteriaTriggers m_10595_(Ljava/lang/String;Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
22
public net.minecraft.world.item.CreativeModeTabs f_256788_
33
public net.minecraft.world.item.CreativeModeTabs f_256725_
44
public net.minecraft.world.item.CreativeModeTabs f_256776_

0 commit comments

Comments
 (0)