Bump version to 1.0.2

Bump mc version to 1.18-pre6
MrJoshuaT · Nov 23, 2021 · 5c87f49 · 5c87f49
1 parent 8c51b20
commit 5c87f49
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 37 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.9-SNAPSHOT'
+	id 'fabric-loom' version '0.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + '+' + project.minecraft_version
@@ -84,4 +84,4 @@ publishing {
 		// The repositories here will be used for publishing your artifact, not for
 		// retrieving dependencies.
 	}
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.17.1
-	yarn_mappings=1.17.1+build.39
-	loader_version=0.11.6
+	minecraft_version=1.18-pre6
+	yarn_mappings=1.18-pre6+build.3
+	loader_version=0.12.5
 
 # Mod Properties
-	mod_version = 1.0.1
+	mod_version = 1.0.2
 	maven_group = com.mrjoshuat
 	archives_base_name = copper-golem
 
 # Dependencies
-	fabric_version=0.41.0+1.17
+	fabric_version=0.42.9+1.18
diff --git a/src/main/java/com/mrjoshuat/coppergolem/ModInit.java b/src/main/java/com/mrjoshuat/coppergolem/ModInit.java
@@ -34,7 +34,7 @@ public class ModInit implements ModInitializer {
 		FabricEntityTypeBuilder.create(SpawnGroup.MISC, CopperGolemEntity::new).dimensions(EntityDimensions.fixed(0.75f, 1.15f)).build()
 	);
 
-	public static final Item IRON_GOLEM_SPAWN_EGG = new SpawnEggItem(COPPER_GOLEM_ENTITY_TYPE,13136982, 	5805694, new Item.Settings().group(ItemGroup.MISC));
+	public static final Item COPPER_GOLEM_SPAWN_EGG = new SpawnEggItem(COPPER_GOLEM_ENTITY_TYPE,13136982, 	5805694, new Item.Settings().group(ItemGroup.MISC));
 
 	public static final Identifier COPPER_BUTTON_ID = new Identifier("minecraft", "copper_button");
 	public static final Identifier EXPOSED_COPPER_BUTTON_ID = new Identifier("minecraft", "exposed_copper_button");
@@ -46,20 +46,20 @@ public class ModInit implements ModInitializer {
 	public static final Identifier WAXED_WEATHERED_COPPER_BUTTON_ID = new Identifier("minecraft", "waxed_weathered_copper_button");
 	public static final Identifier WAXED_OXIDIZED_COPPER_BUTTON_ID = new Identifier("minecraft", "waxed_oxidized_copper_button");
 
-	public static final Block COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidizationLevel.UNAFFECTED, buildButtonSettings(0));
-	public static final Block EXPOSED_COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidizationLevel.EXPOSED, buildButtonSettings(1));
-	public static final Block WEATHERED_COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidizationLevel.WEATHERED, buildButtonSettings(2));
-	public static final Block OXIDIZED_COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidizationLevel.OXIDIZED, buildButtonSettings(3));
+	public static final Block COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidationLevel.UNAFFECTED, buildButtonSettings(0));
+	public static final Block EXPOSED_COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidationLevel.EXPOSED, buildButtonSettings(1));
+	public static final Block WEATHERED_COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidationLevel.WEATHERED, buildButtonSettings(2));
+	public static final Block OXIDIZED_COPPER_BUTTON = new OxidizableButtonBlock(Oxidizable.OxidationLevel.OXIDIZED, buildButtonSettings(3));
 
-	public static final Block WAXED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidizationLevel.UNAFFECTED, buildButtonSettings(0));
-	public static final Block WAXED_EXPOSED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidizationLevel.EXPOSED, buildButtonSettings(1));
-	public static final Block WAXED_WEATHERED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidizationLevel.WEATHERED, buildButtonSettings(2));
-	public static final Block WAXED_OXIDIZED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidizationLevel.OXIDIZED, buildButtonSettings(3));
+	public static final Block WAXED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidationLevel.UNAFFECTED, buildButtonSettings(0));
+	public static final Block WAXED_EXPOSED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidationLevel.EXPOSED, buildButtonSettings(1));
+	public static final Block WAXED_WEATHERED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidationLevel.WEATHERED, buildButtonSettings(2));
+	public static final Block WAXED_OXIDIZED_COPPER_BUTTON = new WaxedOxidizableButtonBlock(Oxidizable.OxidationLevel.OXIDIZED, buildButtonSettings(3));
 
 	@Override
 	public void onInitialize() {
 		FabricDefaultAttributeRegistry.register(COPPER_GOLEM_ENTITY_TYPE, CopperGolemEntity.createMobAttributes());
-		Registry.register(Registry.ITEM, new Identifier("minecraft", "copper_golem_spawn_egg"), IRON_GOLEM_SPAWN_EGG);
+		Registry.register(Registry.ITEM, new Identifier("minecraft", "copper_golem_spawn_egg"), COPPER_GOLEM_SPAWN_EGG);
 
 		registerCopperButton(COPPER_BUTTON_ID, COPPER_BUTTON);
 		registerCopperButton(EXPOSED_COPPER_BUTTON_ID, EXPOSED_COPPER_BUTTON);

diff --git a/src/main/java/com/mrjoshuat/coppergolem/block/OxidizableButton.java b/src/main/java/com/mrjoshuat/coppergolem/block/OxidizableButton.java
@@ -4,12 +4,15 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.mrjoshuat.coppergolem.ModInit;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Degradable;
+import net.minecraft.block.Oxidizable;
 
 import java.util.Optional;
 import java.util.function.Supplier;
 
-public interface OxidizableButton extends Degradable<Oxidizable.OxidizationLevel> {
+public interface OxidizableButton extends Degradable<Oxidizable.OxidationLevel> {
     Supplier<BiMap<Block, Block>> BUTTON_OXIDATION_LEVEL_INCREASES = Suppliers.memoize(() -> {
         BiMap<Block, Block> map = HashBiMap.create();
         map.put(ModInit.COPPER_BUTTON, ModInit.EXPOSED_COPPER_BUTTON);
@@ -56,6 +59,6 @@ default Optional<BlockState> getDegradationResult(BlockState state) {
     }
 
     default float getDegradationChanceMultiplier() {
-        return this.getDegradationLevel() == Oxidizable.OxidizationLevel.UNAFFECTED ? 0.75F : 1.0F;
+        return this.getDegradationLevel() == Oxidizable.OxidationLevel.UNAFFECTED ? 0.75F : 1.0F;
     }
 }
diff --git a/src/main/java/com/mrjoshuat/coppergolem/block/OxidizableButtonBlock.java b/src/main/java/com/mrjoshuat/coppergolem/block/OxidizableButtonBlock.java
@@ -15,9 +15,9 @@
 import java.util.Random;
 
 public class OxidizableButtonBlock extends AbstractButtonBlock implements OxidizableButton {
-    private final Oxidizable.OxidizationLevel oxidizationLevel;
+    private final Oxidizable.OxidationLevel oxidizationLevel;
 
-    public OxidizableButtonBlock(Oxidizable.OxidizationLevel oxidizationLevel, AbstractBlock.Settings settings) {
+    public OxidizableButtonBlock(Oxidizable.OxidationLevel oxidizationLevel, AbstractBlock.Settings settings) {
         super(false, settings);
         this.oxidizationLevel = oxidizationLevel;
     }
@@ -31,7 +31,7 @@ public boolean hasRandomTicks(BlockState state) {
     }
 
     @Override
-    public Oxidizable.OxidizationLevel getDegradationLevel() {
+    public Oxidizable.OxidationLevel getDegradationLevel() {
         return this.oxidizationLevel;
     }
 
@@ -61,7 +61,7 @@ public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity pl
         world.spawnEntity(itemEntity);
     }
 
-    public static int getRedstonePower(Oxidizable.OxidizationLevel level) {
+    public static int getRedstonePower(Oxidizable.OxidationLevel level) {
         return 15 - (3 * switch (level) {
             case UNAFFECTED -> 0;
             case EXPOSED -> 1;

diff --git a/src/main/java/com/mrjoshuat/coppergolem/block/WaxedOxidizableButtonBlock.java b/src/main/java/com/mrjoshuat/coppergolem/block/WaxedOxidizableButtonBlock.java
@@ -14,9 +14,9 @@
 import net.minecraft.world.World;
 
 public class WaxedOxidizableButtonBlock extends AbstractButtonBlock {
-    private Oxidizable.OxidizationLevel level;
+    private Oxidizable.OxidationLevel level;
 
-    public WaxedOxidizableButtonBlock(Oxidizable.OxidizationLevel level, Settings settings) {
+    public WaxedOxidizableButtonBlock(Oxidizable.OxidationLevel level, Settings settings) {
         super(false, settings);
         this.level = level;
     }

diff --git a/src/main/java/com/mrjoshuat/coppergolem/entity/CopperGolemEntity.java b/src/main/java/com/mrjoshuat/coppergolem/entity/CopperGolemEntity.java
@@ -5,7 +5,7 @@
 import com.mrjoshuat.coppergolem.entity.goals.PressButtonGoal;
 import com.mrjoshuat.coppergolem.entity.goals.RodWiggleGoal;
 import com.mrjoshuat.coppergolem.entity.goals.SpinHeadGoal;
-import com.mrjoshuat.coppergolem.entity.target.SearchForButtonsGoal;
+import com.mrjoshuat.coppergolem.entity.goals.SearchForButtonsGoal;
 
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;

diff --git a/...m/entity/target/SearchForButtonsGoal.java → ...em/entity/goals/SearchForButtonsGoal.java b/...m/entity/target/SearchForButtonsGoal.java → ...em/entity/goals/SearchForButtonsGoal.java
@@ -1,4 +1,4 @@
-package com.mrjoshuat.coppergolem.entity.target;
+package com.mrjoshuat.coppergolem.entity.goals;
 
 import com.mrjoshuat.coppergolem.entity.CopperGolemEntity;
 
@@ -21,7 +21,7 @@ public SearchForButtonsGoal(CopperGolemEntity entity) {
 
     @Override
     public boolean canStart() {
-        return this.entity.getBlockTarget() == null && this.entity.getRandom().nextFloat() < 0.1f;
+        return this.entity.getBlockTarget() == null; // && this.entity.getRandom().nextFloat() < 0.1f;
     }
 
     @Override

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -31,9 +31,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.11.3",
-    "fabric": ">=0.41.0",
-    "minecraft": "1.17.x",
-    "java": ">=16"
+    "fabricloader": ">=0.11.7",
+    "fabric": ">=0.41.1",
+    "minecraft": "1.18.x",
+    "java": ">=17"
   }
 }
diff --git a/src/main/resources/fabriccoppergolem.mixins.json b/src/main/resources/fabriccoppergolem.mixins.json
@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.mrjoshuat.coppergolem.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],
   "client": [

diff --git a/src/main/resources/resourcepacks/copper_golem/pack.mcmeta b/src/main/resources/resourcepacks/copper_golem/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 7,
+    "pack_format": 8,
     "description": "Copper Golem textures"
   }
 }