Update to 1.19-pre3

Shnupbups · May 29, 2022 · 7ce73a6 · 7ce73a6
1 parent ccb9556
commit 7ce73a6
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 41 deletions.
diff --git a/build.gradle b/build.gradle
@@ -58,6 +58,9 @@ dependencies {
 
 	// RoughlyEnoughItems
     modImplementation "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
+
+	// Architectury Fabric
+	modImplementation "dev.architectury:architectury-fabric:${project.arch_version}"
 
 	// Cloth Config
 	modApi ("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {

diff --git a/gradle.properties b/gradle.properties
@@ -3,27 +3,30 @@
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop/
-	minecraft_version=1.18.2
-	yarn_mappings=3
+	minecraft_version=1.19-pre3
+	yarn_mappings=4
 	tiny_version=2
-	loader_version=0.13.3
+	loader_version=0.14.6
 
 # Mod Properties
 	mod_version = 1.8.1
 	maven_group = com.shnupbups
 	mod_name = redstone-bits
-	version_meta = fabric-mc1.18.2
+	version_meta = fabric-mc1.19
 
 # Dependencies
 	# check on https://fabricmc.net/develop/
-	fapi_version=0.51.1+1.18.2
+	fapi_version=0.53.4+1.19
 
 # Other Stuff
 	# check on maven at https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
-	rei_version = 8.1.457
-
+	rei_version = 9.0.466
+
+	# check on maven at https://maven.shedaniel.me/dev/architectury/architectury-fabric/
+	arch_version = 5.4.14
+
 	# check on maven at https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
-	modmenu_version = 3.2.1
+	modmenu_version = 4.0.0-beta.4
 
 	# check on maven at https://maven.shedaniel.me/me/shedaniel/cloth/cloth-config-fabric/
-	cloth_config_version = 6.2.62
+	cloth_config_version = 7.0.65
diff --git a/src/main/java/com/shnupbups/redstonebits/FakePlayerEntity.java b/src/main/java/com/shnupbups/redstonebits/FakePlayerEntity.java
@@ -14,7 +14,7 @@ public class FakePlayerEntity extends PlayerEntity {
 	public static final GameProfile profile = new GameProfile(uuid, name);
 
 	public FakePlayerEntity(World world, BlockPos pos) {
-		super(world, pos, 0.0f, profile);
+		super(world, pos, 0.0f, profile, null);
 	}
 
 	@Override

diff --git a/src/main/java/com/shnupbups/redstonebits/block/AdderOrCounterBlock.java b/src/main/java/com/shnupbups/redstonebits/block/AdderOrCounterBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import net.minecraft.block.AbstractRedstoneGateBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -18,6 +16,7 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;

diff --git a/src/main/java/com/shnupbups/redstonebits/block/AnalogRedstoneReceiverBlock.java b/src/main/java/com/shnupbups/redstonebits/block/AnalogRedstoneReceiverBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemPlacementContext;
@@ -10,6 +8,7 @@
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.World;
 
 public class AnalogRedstoneReceiverBlock extends Block {

diff --git a/src/main/java/com/shnupbups/redstonebits/block/BreakerBlock.java b/src/main/java/com/shnupbups/redstonebits/block/BreakerBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.block.Block;
@@ -16,7 +14,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
@@ -29,7 +26,6 @@
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -38,6 +34,7 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.World;
 
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
@@ -89,7 +86,7 @@ public void writeScreenOpeningData(ServerPlayerEntity player, PacketByteBuf buf)
 
 			@Override
 			public Text getDisplayName() {
-				return new TranslatableText(getTranslationKey());
+				return Text.translatable(getTranslationKey());
 			}
 
 			@Override

diff --git a/src/main/java/com/shnupbups/redstonebits/block/CheckerBlock.java b/src/main/java/com/shnupbups/redstonebits/block/CheckerBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.block.Block;
@@ -24,14 +22,14 @@
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldAccess;
@@ -188,7 +186,7 @@ public void writeScreenOpeningData(ServerPlayerEntity player, PacketByteBuf buf)
 
 			@Override
 			public Text getDisplayName() {
-				return new TranslatableText(getTranslationKey());
+				return Text.translatable(getTranslationKey());
 			}
 
 			@Override

diff --git a/src/main/java/com/shnupbups/redstonebits/block/CopperButtonBlock.java b/src/main/java/com/shnupbups/redstonebits/block/CopperButtonBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Oxidizable;
@@ -13,6 +11,7 @@
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.World;
 
 public class CopperButtonBlock extends ModButtonBlock implements Oxidizable {

diff --git a/src/main/java/com/shnupbups/redstonebits/block/CopperPressurePlateBlock.java b/src/main/java/com/shnupbups/redstonebits/block/CopperPressurePlateBlock.java
@@ -1,12 +1,11 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Oxidizable;
 import net.minecraft.block.WeightedPressurePlateBlock;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
 
 public class CopperPressurePlateBlock extends WeightedPressurePlateBlock implements Oxidizable {
 	private final Oxidizable.OxidationLevel oxidationLevel;

diff --git a/src/main/java/com/shnupbups/redstonebits/block/InverterBlock.java b/src/main/java/com/shnupbups/redstonebits/block/InverterBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import net.minecraft.block.AbstractRedstoneGateBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;
@@ -21,6 +19,7 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;

diff --git a/src/main/java/com/shnupbups/redstonebits/block/ResistorBlock.java b/src/main/java/com/shnupbups/redstonebits/block/ResistorBlock.java
@@ -1,7 +1,5 @@
 package com.shnupbups.redstonebits.block;
 
-import java.util.Random;
-
 import net.minecraft.block.AbstractRedstoneGateBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockEntityProvider;
@@ -20,6 +18,7 @@
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.random.Random;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;

diff --git a/src/main/java/com/shnupbups/redstonebits/blockentity/BreakerBlockEntity.java b/src/main/java/com/shnupbups/redstonebits/blockentity/BreakerBlockEntity.java
@@ -20,7 +20,6 @@
 import net.minecraft.server.world.ServerChunkManager;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Hand;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
@@ -237,7 +236,7 @@ public PlayerEntity getFakePlayer() {
 
 	@Override
 	public Text getContainerName() {
-		return new TranslatableText("container.redstonebits.breaker");
+		return Text.translatable("container.redstonebits.breaker");
 	}
 
 	@Override

diff --git a/src/main/java/com/shnupbups/redstonebits/blockentity/CheckerBlockEntity.java b/src/main/java/com/shnupbups/redstonebits/blockentity/CheckerBlockEntity.java
@@ -12,7 +12,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -58,7 +57,7 @@ public BlockPos getCheckPos() {
 
 	@Override
 	public Text getContainerName() {
-		return new TranslatableText("container.redstonebits.checker");
+		return Text.translatable("container.redstonebits.checker");
 	}
 
 	@Override

diff --git a/src/main/java/com/shnupbups/redstonebits/blockentity/PlacerBlockEntity.java b/src/main/java/com/shnupbups/redstonebits/blockentity/PlacerBlockEntity.java
@@ -3,7 +3,6 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.DispenserBlockEntity;
 import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
 import net.minecraft.util.math.BlockPos;
 
 import com.shnupbups.redstonebits.init.ModBlockEntities;
@@ -15,6 +14,6 @@ public PlacerBlockEntity(BlockPos pos, BlockState state) {
 
 	@Override
 	protected Text getContainerName() {
-		return new TranslatableText("container.redstonebits.placer");
+		return Text.translatable("container.redstonebits.placer");
 	}
 }
diff --git a/src/main/java/com/shnupbups/redstonebits/datagen/RBRecipeProvider.java b/src/main/java/com/shnupbups/redstonebits/datagen/RBRecipeProvider.java
@@ -27,7 +27,7 @@ public RBRecipeProvider(FabricDataGenerator dataGenerator) {
 	protected void generateRecipes(Consumer<RecipeJsonProvider> exporter) {
 		RedstoneBits.LOGGER.info("Generating recipes...");
 
-		createPressurePlateRecipe(exporter, ModBlocks.MEDIUM_WEIGHTED_PRESSURE_PLATE, Items.COPPER_INGOT);
+		offerPressurePlateRecipe(exporter, ModBlocks.MEDIUM_WEIGHTED_PRESSURE_PLATE, Items.COPPER_INGOT);
 		offerSingleOutputShapelessRecipe(exporter, ModBlocks.COPPER_BUTTON, Items.COPPER_INGOT, null);
 
 		offerWaxing(exporter, ModBlocks.COPPER_BUTTON, ModBlocks.WAXED_COPPER_BUTTON);

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -41,9 +41,9 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.12.0",
-	"fabric": ">=0.43.0",
-    "minecraft": "1.18.2",
+    "fabricloader": ">=0.14.0",
+	"fabric": ">=0.53.0",
+    "minecraft": ">=1.19-beta.3",
     "java": ">=17",
     "cloth-config": "*"
   }