Skip to content

Commit ccc5945

Browse files
committed
Moved to Partchment Mappings
1 parent 12ad92e commit ccc5945

File tree

4 files changed

+38
-18
lines changed

4 files changed

+38
-18
lines changed

build.gradle

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ architectury {
1717
changelog {
1818
repositoryUrl = rootProject.repository_url
1919
introduction = """
20-
Changelog to track updates for this mod.
21-
Add your changes to Unreleased if you want to commit.
20+
Changelog to track updates for this mod.
21+
Add your changes to Unreleased if you want to commit.
2222
Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
2323
"""
2424
combinePreReleases = false
@@ -33,7 +33,10 @@ subprojects {
3333

3434
dependencies {
3535
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
36-
mappings loom.officialMojangMappings()
36+
mappings loom.layered() {
37+
officialMojangMappings()
38+
parchment("org.parchmentmc.data:parchment-1.20.2:2023.10.08@zip")
39+
}
3740
}
3841
}
3942

@@ -48,6 +51,13 @@ allprojects {
4851

4952
repositories {
5053
mavenCentral()
54+
maven {
55+
url = uri("https://maven.neoforged.net/releases/#/")
56+
}
57+
maven {
58+
name = 'ParchmentMC'
59+
url = 'https://maven.parchmentmc.org'
60+
}
5161
}
5262

5363
tasks.withType(JavaCompile) {
Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.modsauce.otyacraftenginerenewed.data.provider;
22

3+
import java.util.concurrent.CompletableFuture;
4+
import java.util.function.Function;
35
import net.minecraft.core.HolderLookup;
46
import net.minecraft.data.PackOutput;
57
import net.minecraft.data.tags.TagsProvider;
@@ -10,28 +12,41 @@
1012
import org.jetbrains.annotations.NotNull;
1113
import org.modsauce.otyacraftenginerenewed.data.CrossDataGeneratorAccess;
1214

13-
import java.util.concurrent.CompletableFuture;
14-
import java.util.function.Function;
15+
public abstract class ItemTagProviderWrapper
16+
extends IntrinsicHolderTagsProviderWrapper<
17+
Item,
18+
ItemTagProviderWrapper.ItemTagProviderAccess
19+
> {
1520

16-
public abstract class ItemTagProviderWrapper extends IntrinsicHolderTagsProviderWrapper<Item, ItemTagProviderWrapper.ItemTagProviderAccess> {
1721
private final TagsProvider<Item> itemTagsProvider;
1822

19-
public ItemTagProviderWrapper(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, CrossDataGeneratorAccess crossDataGeneratorAccess, @NotNull BlockTagProviderWrapper blockTagProviderWrapper) {
23+
public ItemTagProviderWrapper(
24+
PackOutput packOutput,
25+
CompletableFuture<HolderLookup.Provider> lookup,
26+
CrossDataGeneratorAccess crossDataGeneratorAccess,
27+
@NotNull BlockTagProviderWrapper blockTagProviderWrapper
28+
) {
2029
super(packOutput, lookup, crossDataGeneratorAccess);
21-
this.itemTagsProvider = crossDataGeneratorAccess.createItemTagProvider(packOutput, lookup, this, blockTagProviderWrapper);
30+
this.itemTagsProvider = crossDataGeneratorAccess.createItemTagProvider(
31+
packOutput,
32+
lookup,
33+
this,
34+
blockTagProviderWrapper
35+
);
2236
}
2337

2438
@Override
2539
public Function<Item, ResourceKey<Item>> getKeyExtractor() {
26-
return (item) -> item.builtInRegistryHolder().key();
40+
return item -> item.builtInRegistryHolder().key();
2741
}
2842

2943
@Override
3044
public TagsProvider<Item> getProvider() {
3145
return this.itemTagsProvider;
3246
}
3347

34-
public static interface ItemTagProviderAccess extends IntrinsicTagProviderAccess<Item> {
48+
public static interface ItemTagProviderAccess
49+
extends IntrinsicTagProviderAccess<Item> {
3550
void copy(TagKey<Block> blockTag, TagKey<Item> itemTag);
3651
}
3752
}

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ felnull_version=1.75
1717
cloth_config_version=15.0.140
1818
modmenu_version=11.0.3
1919
rei_version=16.0.799
20+
parchment_mappings=1.21.1-2024.11.17
2021
# Upload
2122
curesforge_id=
2223
modrinth_id=
@@ -26,4 +27,4 @@ maven_group=Github
2627
maven_put_pass=
2728
# Other
2829
repository_url=https://github.com/Mod-Sauce/OtyacraftEngineRenewed
29-
repsyUrl=https://repo.repsy.io/mvn/mod-sauce/otyacraftenginerenewed
30+
repsyUrl=https://repo.repsy.io/mvn/mod-sauce/otyacraftenginerenewed

neoforge/build.gradle

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ architectury {
88
platformSetupLoomIde()
99
neoForge()
1010
}
11-
repositories {
12-
mavenCentral()
13-
maven {
14-
url = uri("https://maven.neoforged.net/releases/#/")
15-
}
16-
}
1711

1812
/*
1913
neoForge {
@@ -36,7 +30,7 @@ configurations {
3630

3731
dependencies {
3832
neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
39-
33+
4034
modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
4135

4236
common(project(path: ":common", configuration: "namedElements")) { transitive false }

0 commit comments

Comments
 (0)