Fixes MohistMC compatibility

GameModsBR · Oct 18, 2021 · 6cfcd5e · 6cfcd5e
1 parent 0d1dbbd
commit 6cfcd5e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/src/main/java/shadows/apotheosis/deadly/DeadlyModule.java b/src/main/java/shadows/apotheosis/deadly/DeadlyModule.java
@@ -32,7 +32,6 @@
 import shadows.apotheosis.Apotheosis.ApotheosisConstruction;
 import shadows.apotheosis.Apotheosis.ApotheosisReloadEvent;
 import shadows.apotheosis.ApotheosisObjects;
-import shadows.apotheosis.deadly.DeadlyModuleClient.RainbowColor;
 import shadows.apotheosis.deadly.affix.AffixEvents;
 import shadows.apotheosis.deadly.affix.LootRarity;
 import shadows.apotheosis.deadly.affix.recipe.AffixShardingRecipe;
@@ -81,7 +80,7 @@ public void init(FMLCommonSetupEvent e) {
 		}
 		RecipeHelper.addRecipe(new AffixShardingRecipe(new ResourceLocation(Apotheosis.MODID, "affix_sharding_" + LootRarity.ANCIENT.name().toLowerCase(Locale.ROOT)), LootRarity.ANCIENT));
 		Color.NAMED_COLORS = new HashMap<>(Color.NAMED_COLORS);
-		Color.NAMED_COLORS.put("rainbow", new RainbowColor());
+		Color.NAMED_COLORS.put("rainbow", DeadlyModuleClient.getRainbowColor());
 	}
 
 	@SubscribeEvent
@@ -155,4 +154,4 @@ public static void debugLog(BlockPos pos, String name) {
 		if (DEBUG) DeadlyModule.LOGGER.info("Generated a {} at {} {} {}", name, pos.getX(), pos.getY(), pos.getZ());
 	}
 
-}
+}
diff --git a/src/main/java/shadows/apotheosis/deadly/DeadlyModuleClient.java b/src/main/java/shadows/apotheosis/deadly/DeadlyModuleClient.java
@@ -8,6 +8,8 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
 import net.minecraftforge.event.TickEvent.Phase;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.forgespi.Environment;
 import shadows.apotheosis.ApotheosisObjects;
 import shadows.apotheosis.deadly.objects.AffixTomeItem;
 import shadows.apotheosis.deadly.objects.RarityShardItem;
@@ -38,9 +40,20 @@ public static void tick(ClientTickEvent e) {
 		}
 	}
 
-	public static class RainbowColor extends Color {
+	public static Color getRainbowColor() {
+		if (Environment.get().getDist().isClient()) {
+			return new RainbowColorClient();
+		}
+
+		// MohistMC build 820 compatibility
+		Color color = Color.fromRgb(0);
+		color.name = "rainbow";
+		return color;
+	}
+
+	private static class RainbowColorClient extends Color {
 
-		public RainbowColor() {
+		public RainbowColorClient() {
 			super(0, "rainbow");
 		}
 

diff --git a/src/main/java/shadows/apotheosis/deadly/affix/LootRarity.java b/src/main/java/shadows/apotheosis/deadly/affix/LootRarity.java
@@ -3,7 +3,7 @@
 import java.util.Random;
 
 import net.minecraft.util.text.Color;
-import shadows.apotheosis.deadly.DeadlyModuleClient.RainbowColor;
+import shadows.apotheosis.deadly.DeadlyModuleClient;
 import shadows.apotheosis.deadly.config.DeadlyConfig;
 
 /**
@@ -21,7 +21,7 @@ public enum LootRarity {
 	RARE(0x5555FF, 2),
 	EPIC(0xBB00BB, 3),
 	MYTHIC(0xED7014, 3),
-	ANCIENT(new RainbowColor(), 3);
+	ANCIENT(DeadlyModuleClient.getRainbowColor(), 3);
 
 	final Color color;
 	final int affixes;
@@ -74,4 +74,4 @@ public static LootRarity random(Random rand, int min) {
 	public static LootRarity random(Random rand) {
 		return random(rand, 0);
 	}
-}
+}
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
@@ -37,4 +37,5 @@ public-f net.minecraft.advancements.CriteriaTriggers field_192129_i # ENCHANTED_
 public-f net.minecraft.advancements.CriteriaTriggers field_192125_e # INVENTORY_CHANGED
 public-f net.minecraft.util.text.Color
 public net.minecraft.util.text.Color <init>(ILjava/lang/String;)V
-public-f net.minecraft.util.text.Color field_240739_b_ # NAMED_COLORS
+public-f net.minecraft.util.text.Color field_240739_b_ # NAMED_COLORS
+public-f net.minecraft.util.text.Color field_240741_d_ # name