Skip to content

Commit 5ba7a00

Browse files
lowercasebtwlowercasebtw
committed
More work on multiversion
1 parent e1a9843 commit 5ba7a00

24 files changed

+234
-142
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ org.gradle.parallel=true
55
org.gradle.configureondemand=true
66
org.gradle.parallel.threads=4
77
org.gradle.jvmargs=-Xmx2G
8+
dgt.loom.mappings=official-like
89

910
mod.name=GlintColorizer
1011
mod.id=glintcolorizer

‎root.gradle.kts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ preprocess {
77
"1.21.8-fabric"(1_21_08, "yarn") {
88
"1.21.5-fabric"(1_21_05, "yarn") {
99
"1.21.4-fabric"(1_21_04, "yarn") {
10-
"1.21.1-fabric"(1_21_01, "yarn") {
11-
"1.16.5-fabric"(1_16_05, "yarn") {
12-
"1.16.5-forge"(1_16_05, "srg") {
13-
"1.12.2-forge"(1_12_02, "srg") {
14-
"1.12.2-fabric"(1_12_02, "yarn") {
15-
"1.8.9-fabric"(1_08_09, "yarn") {
16-
"1.8.9-forge"(1_08_09, "srg")
17-
}
10+
"1.16.5-fabric"(1_16_05, "yarn") {
11+
"1.16.5-forge"(1_16_05, "srg") {
12+
"1.12.2-forge"(1_12_02, "srg") {
13+
"1.12.2-fabric"(1_12_02, "yarn") {
14+
"1.8.9-fabric"(1_08_09, "yarn") {
15+
"1.8.9-forge"(1_08_09, "srg")
1816
}
1917
}
2018
}

‎settings.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ listOf(
4646
"1.12.2-fabric",
4747
"1.16.5-forge",
4848
"1.16.5-fabric",
49-
"1.21.1-fabric",
5049
"1.21.4-fabric",
5150
"1.21.5-fabric",
5251
"1.21.8-fabric"

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_12_2/MixinLayerArmorBase.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package org.polyfrost.glintcolorizer.mixin.v1_12_2;
22

3+
import net.minecraft.client.renderer.entity.layers.LayerArmorBase;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
6+
//#if MC <= 1.12.2
37
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
48
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
59
import dev.deftu.omnicore.api.color.OmniColor;
6-
import net.minecraft.client.renderer.entity.layers.LayerArmorBase;
710
import org.polyfrost.glintcolorizer.GlintLayer;
811
import org.polyfrost.glintcolorizer.GlintMetadata;
912
import org.polyfrost.glintcolorizer.config.GlintConfig;
10-
import org.spongepowered.asm.mixin.Mixin;
1113
import org.spongepowered.asm.mixin.injection.At;
1214
import org.spongepowered.asm.mixin.injection.Inject;
1315
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
16+
//#endif
1417

1518
@Mixin(LayerArmorBase.class)
1619
public abstract class MixinLayerArmorBase {

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_12_2/MixinRenderItem.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
package org.polyfrost.glintcolorizer.mixin.v1_12_2;
22

3+
import net.minecraft.client.renderer.entity.RenderItem;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
6+
//#if MC <= 1.12.2
37
import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
48
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
59
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
610
import net.minecraft.client.renderer.GlStateManager;
7-
import net.minecraft.client.renderer.entity.RenderItem;
811
import net.minecraft.client.resources.model.IBakedModel;
912
import net.minecraft.item.ItemStack;
1013
import org.polyfrost.glintcolorizer.GlintLayer;
1114
import org.polyfrost.glintcolorizer.GlintMetadata;
1215
import org.polyfrost.glintcolorizer.config.GlintConfig;
1316
import org.polyfrost.glintcolorizer.config.ShinyPots;
14-
import org.spongepowered.asm.mixin.Mixin;
17+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1518
import org.spongepowered.asm.mixin.injection.At;
1619
import org.spongepowered.asm.mixin.injection.Inject;
1720
import org.spongepowered.asm.mixin.injection.ModifyArg;
18-
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
21+
//#endif
1922

2023
@Mixin(RenderItem.class)
2124
public abstract class MixinRenderItem {

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_12_2/accessor/RenderModelAccessor.java‎

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

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_21/MixinCompositeRenderType.java‎

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

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_21/MixinItem.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
package org.polyfrost.glintcolorizer.mixin.v1_21;
22

3+
import net.minecraft.item.Item;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
6+
@Mixin(Item.class)
37
public abstract class MixinItem {
48
}

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_21/MixinItemModelResolver.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
package org.polyfrost.glintcolorizer.mixin.v1_21;
22

3+
import org.spongepowered.asm.mixin.Mixin;
4+
5+
//#if MC >=1.21.4
6+
//$$ @Mixin(net.minecraft.client.renderer.item.ItemModelResolver.class)
7+
//#else
8+
@Mixin(net.minecraft.client.Minecraft.class)
9+
//#endif
310
public abstract class MixinItemModelResolver {
411
}

‎src/main/java/org/polyfrost/glintcolorizer/mixin/v1_21/MixinItemRenderer.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
package org.polyfrost.glintcolorizer.mixin.v1_21;
22

3+
import net.minecraft.client.renderer.entity.RenderItem;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
6+
@Mixin(RenderItem.class)
37
public abstract class MixinItemRenderer {
48
}

0 commit comments

Comments
 (0)