Finally release this thing!

Up-Mods · Oct 5, 2021 · 596c591 · 596c591
1 parent 2329efc
commit 596c591
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Damage Incorporated is a mod that adds many individual game rules which lets you
 This mod is available for download on the following services:
 
 - [Modrinth (recommended)](https://modrinth.com/mod/damage-incorporated)
-<!-- - [CurseForge (recommended)](https://www.curseforge.com/minecraft/mc-mods/) -->
+- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/damage-incorporated)
 - [GitHub Releases (alternative)](https://github.com/EnnuiL/DamageIncorporated/releases)
 
 ## License

diff --git a/src/main/java/io/github/ennuil/damageincorporated/DamageIncorporatedMod.java b/src/main/java/io/github/ennuil/damageincorporated/DamageIncorporatedMod.java
@@ -16,27 +16,27 @@
 public class DamageIncorporatedMod implements ModInitializer {
 	public static CustomGameRuleCategory DAMAGE_INCORPORATED_EXPLOSIONS_CATEGORY = new CustomGameRuleCategory(
 		new Identifier("damageincorporated", "explosions_gamerules"),
-		new TranslatableText("damageincorporated.gamerule.category.explosions").formatted(Formatting.BOLD, Formatting.GOLD)
+		new TranslatableText("damageincorporated.gamerule.category.explosions").formatted(Formatting.BOLD, Formatting.DARK_AQUA)
 	);
 
 	public static CustomGameRuleCategory DAMAGE_INCORPORATED_GENERAL_CATEGORY = new CustomGameRuleCategory(
 		new Identifier("damageincorporated", "general_gamerules"),
-		new TranslatableText("damageincorporated.gamerule.category.general").formatted(Formatting.BOLD, Formatting.GOLD)
-	);
-
-	public static CustomGameRuleCategory DAMAGE_INCORPORATED_UNDEAD_MOBS_CATEGORY = new CustomGameRuleCategory(
-		new Identifier("damageincorporated", "undead_mobs_gamerules"),
-		new TranslatableText("damageincorporated.gamerule.category.undead_mobs").formatted(Formatting.BOLD, Formatting.GOLD)
+		new TranslatableText("damageincorporated.gamerule.category.general").formatted(Formatting.BOLD, Formatting.DARK_AQUA)
 	);
 
 	public static CustomGameRuleCategory DAMAGE_INCORPORATED_HOSTILE_MOBS_CATEGORY = new CustomGameRuleCategory(
 		new Identifier("damageincorporated", "hostile_mobs_gamerules"),
-		new TranslatableText("damageincorporated.gamerule.category.hostile_mobs").formatted(Formatting.BOLD, Formatting.GOLD)
+		new TranslatableText("damageincorporated.gamerule.category.hostile_mobs").formatted(Formatting.BOLD, Formatting.DARK_AQUA)
+	);
+
+	public static CustomGameRuleCategory DAMAGE_INCORPORATED_UNDEAD_MOBS_CATEGORY = new CustomGameRuleCategory(
+		new Identifier("damageincorporated", "undead_mobs_gamerules"),
+		new TranslatableText("damageincorporated.gamerule.category.undead_mobs").formatted(Formatting.BOLD, Formatting.DARK_AQUA)
 	);
 
 	public static CustomGameRuleCategory DAMAGE_INCORPORATED_PASSIVE_MOBS_CATEGORY = new CustomGameRuleCategory(
 		new Identifier("damageincorporated", "passive_gamerules"),
-		new TranslatableText("damageincorporated.gamerule.category.passive_mobs").formatted(Formatting.BOLD, Formatting.GOLD)
+		new TranslatableText("damageincorporated.gamerule.category.passive_mobs").formatted(Formatting.BOLD, Formatting.DARK_AQUA)
 	);
 
 	public static GameRules.Key<EnumRule<DamageIncDestructionType>> CREEPER_DESTRUCTION_TYPE_RULE;

diff --git a/src/main/java/io/github/ennuil/damageincorporated/mixin/CropBlockMixin.java b/src/main/java/io/github/ennuil/damageincorporated/mixin/CropBlockMixin.java
@@ -23,7 +23,7 @@ public class CropBlockMixin {
 
 	@Inject(
 		at = @At("HEAD"),
-		method = "onEntityCollision(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V"
+		method = "onEntityCollision(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V"
 	)
 	private void getOnEntityCollisionArgs(BlockState state, World world, BlockPos pos, Entity entity, CallbackInfo ci) {
 		this.storedWorld = world;
@@ -34,7 +34,7 @@ private void getOnEntityCollisionArgs(BlockState state, World world, BlockPos po
 			value = "INVOKE",
 			target = "net/minecraft/world/GameRules.getBoolean(Lnet/minecraft/world/GameRules$Key;)Z"
 		),
-		method = "onEntityCollision(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V"
+		method = "onEntityCollision(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V"
 	)
 	private Key<BooleanRule> modifyRavagerCropGameRule(Key<BooleanRule> originalRule) {
 		if (this.storedWorld.getGameRules().getBoolean(originalRule)) {

diff --git a/src/main/java/io/github/ennuil/damageincorporated/mixin/PowderSnowBlockMixin.java b/src/main/java/io/github/ennuil/damageincorporated/mixin/PowderSnowBlockMixin.java
@@ -22,7 +22,7 @@ public class PowderSnowBlockMixin {
 			value = "INVOKE",
 			target = "Lnet/minecraft/entity/Entity;isOnFire()Z"
 		),
-		method = "onEntityCollision(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V",
+		method = "onEntityCollision(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/Entity;)V",
 		cancellable = true
 	)
 	private void cancelIfStatement(BlockState state, World world, BlockPos pos, Entity entity, CallbackInfo ci) {

diff --git a/src/main/resources/assets/damageincorporated/icon.png b/src/main/resources/assets/damageincorporated/icon.png