Skip to content

Commit 030862c

Browse files
committed
1.2.0
1 parent 7cc63c7 commit 030862c

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0
1212

1313
### Changed
1414

15+
- Port MC1.20 [#2](https://github.com/TeamFelnull/SpecialModelLoader/pull/2)
16+
1517
### Deprecated
1618

1719
### Removed

build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id "com.github.johnrengelman.shadow" version "8.1.1"
44
id 'maven-publish'
55
id 'com.matthewprenger.cursegradle' version '1.4.0'
6-
id "com.modrinth.minotaur" version "2.4.4"
6+
id "com.modrinth.minotaur" version "2.8.0"
77
id 'org.jetbrains.changelog' version "2.0.0"
88
}
99

@@ -70,10 +70,7 @@ repositories {
7070
}
7171

7272
configurations {
73-
shadowImplementation {
74-
extendsFrom implementation
75-
canBeResolved true
76-
}
73+
shadowIn
7774
modImplementation.extendsFrom shadowIn
7875
}
7976

@@ -88,14 +85,14 @@ dependencies {
8885
}
8986

9087
shadowJar {
91-
configurations = [project.configurations.shadowImplementation]
88+
configurations = [project.configurations.shadowIn]
9289
archiveClassifier.set("dev-shadow")
9390

9491
relocate 'de.javagl', 'dev.felnull.specialmodelloader.impl.include.de.javagl'
9592
}
9693

9794
remapJar {
98-
input.set shadowJar.archiveFile
95+
inputFile.set(shadowJar.archiveFile)
9996
dependsOn shadowJar
10097
archiveClassifier.set(null)
10198
setArchivesBaseName("${rootProject.archives_base_name}-mc${rootProject.minecraft_version}")

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod_version=1.2.0
1010
#Dependencies
1111
loader_version=0.14.21
1212
fabric_version=0.83.0+1.20
13-
#-Maven-#
13+
#Maven
1414
maven_group=dev.felnull
1515
maven_put_url=https://maven.felnull.dev/
1616
maven_put_pass=

src/main/resources/fabric.mod.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@
88
"FelNull developers",
99
"MORIMORI0317"
1010
],
11+
"contributors": [
12+
"StarBoyCeleste",
13+
"MerlinDaWizard"
14+
],
1115
"contact": {
1216
"email": "[email protected]",
13-
"sources": "https://github.com/TeamFelnull/SpecialModelLoader"
17+
"sources": "https://github.com/TeamFelnull/SpecialModelLoader",
18+
"issues": "https://github.com/TeamFelnull/SpecialModelLoader/issues"
1419
},
1520
"license": "MIT License",
1621
"icon": "assets/special-model-loader/icon.png",

src/test/java/dev/felnull/smltest/block/SMLTestBlocks.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ public static void init() {
2626
register("facing_model_block", FACING_MODEL_BLOCK);
2727
register("facing_obj_model_block", FACING_OBJ_MODEL_BLOCK);
2828

29-
ItemGroupEvents.MODIFY_ENTRIES_ALL.register((group, entries) -> {
30-
if (group == BuiltInRegistries.CREATIVE_MODE_TAB.get(CreativeModeTabs.BUILDING_BLOCKS)) {
31-
entries.accept(NORMAL_MODEL_BLOCK);
32-
entries.accept(OBJ_MODEL_BLOCK);
33-
entries.accept(FACING_MODEL_BLOCK);
34-
entries.accept(FACING_OBJ_MODEL_BLOCK);
35-
}
29+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(ct -> {
30+
ct.accept(NORMAL_MODEL_BLOCK);
31+
ct.accept(OBJ_MODEL_BLOCK);
32+
ct.accept(FACING_MODEL_BLOCK);
33+
ct.accept(FACING_OBJ_MODEL_BLOCK);
3634
});
3735
}
3836

src/test/java/dev/felnull/smltest/item/SMLTestItems.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@ public static void init() {
2323
register("forge_obj_model_item", FORGE_OBJ_MODEL_ITEM);
2424
register("dynamic_obj_model_item", DYNAMIC_OBJ_MODEL_ITEM);
2525

26-
ItemGroupEvents.MODIFY_ENTRIES_ALL.register((group, entries) -> {
27-
if (group == BuiltInRegistries.CREATIVE_MODE_TAB.get(CreativeModeTabs.BUILDING_BLOCKS)) {
28-
entries.accept(NORMAL_MODEL_ITEM);
29-
entries.accept(OBJ_MODEL_ITEM);
30-
entries.accept(OBJ2_MODEL_ITEM);
31-
entries.accept(FORGE_OBJ_MODEL_ITEM);
32-
entries.accept(DYNAMIC_OBJ_MODEL_ITEM);
33-
}
26+
ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.BUILDING_BLOCKS).register(ct -> {
27+
ct.accept(NORMAL_MODEL_ITEM);
28+
ct.accept(OBJ_MODEL_ITEM);
29+
ct.accept(OBJ2_MODEL_ITEM);
30+
ct.accept(FORGE_OBJ_MODEL_ITEM);
31+
ct.accept(DYNAMIC_OBJ_MODEL_ITEM);
3432
});
3533
}
3634

0 commit comments

Comments
 (0)