1.20

nanite · Jun 9, 2023 · c948d85 · c948d85
1 parent d86d43f
commit c948d85
Show file tree

Hide file tree

Showing 19 changed files with 50 additions and 51 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
 }
 

diff --git a/common/src/main/java/dev/wuffs/BambooEverything.java b/common/src/main/java/dev/wuffs/BambooEverything.java
@@ -1,17 +1,20 @@
 package dev.wuffs;
 
-import dev.architectury.registry.CreativeTabRegistry;
 import dev.architectury.registry.fuel.FuelRegistry;
+import dev.architectury.registry.registries.DeferredRegister;
+import dev.architectury.registry.registries.RegistrySupplier;
 import dev.wuffs.blocks.Blocks;
 import dev.wuffs.items.Items;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 
 public class BambooEverything {
     public static final String MOD_ID = "bambooeverything";
     public static void init() {
         Blocks.BLOCKS.register();
         Items.ITEMS.register();
+        CREATIVE_TAB.register();
     }
 
     public static void fuelRegister(){
@@ -20,8 +23,11 @@ public static void fuelRegister(){
         FuelRegistry.register(50, Items.DRY_BAMBOO.get());
     }
 
-    public static final CreativeTabRegistry.TabSupplier CREATIVE_TAB = CreativeTabRegistry.create(
-            new ResourceLocation(BambooEverything.MOD_ID, "creative_tab"),
-            () -> new ItemStack(Items.BUNDLE.get())
-    );
+    public static final DeferredRegister<CreativeModeTab> CREATIVE_TAB = DeferredRegister.create(BambooEverything.MOD_ID, Registries.CREATIVE_MODE_TAB);
+
+    public static final RegistrySupplier<CreativeModeTab> TAB = CREATIVE_TAB.register(BambooEverything.MOD_ID, () -> CreativeModeTab.builder(CreativeModeTab.Row.TOP, 0).displayItems(
+            (itemDisplayParameters, output) -> {
+                Items.ITEMS.forEach(e -> output.accept(e.get()));
+            }
+    ).icon(() -> new ItemStack(Items.BUNDLE.get())).build());
 }
diff --git a/common/src/main/java/dev/wuffs/blocks/Blocks.java b/common/src/main/java/dev/wuffs/blocks/Blocks.java
@@ -11,7 +11,6 @@
 import net.minecraft.world.level.block.TorchBlock;
 import net.minecraft.world.level.block.WallTorchBlock;
 import net.minecraft.world.level.block.state.BlockBehaviour;
-import net.minecraft.world.level.material.Material;
 
 public class Blocks {
 
@@ -40,15 +39,15 @@ public class Blocks {
 //    public static final RegistrySupplier<Block> TIKI_TORCH = BLOCKS.register("tiki_torch", BambooTikiTorch::new);
 //    public static final RegistrySupplier<Block> DRY_TIKI_TORCH = BLOCKS.register("dry_tiki_torch", BambooTikiTorch::new);
     public static final RegistrySupplier<Block> TORCH = BLOCKS.register("bamboo_torch", () -> new TorchBlock(
-            BlockBehaviour.Properties.of(Material.DECORATION)
+            BlockBehaviour.Properties.of()
                     .noCollission()
                     .instabreak()
                     .lightLevel((x) -> 14)
                     .sound(SoundType.BAMBOO)
                     .noOcclusion()
             , ParticleTypes.FLAME));
     public static final RegistrySupplier<Block> WALL_TORCH = BLOCKS.register("bamboo_wall_torch", () -> new WallTorchBlock(
-            BlockBehaviour.Properties.of(Material.DECORATION)
+            BlockBehaviour.Properties.of()
                     .noCollission()
                     .instabreak()
                     .lightLevel((x) -> 14)
@@ -58,15 +57,15 @@ public class Blocks {
             , ParticleTypes.FLAME));
 
     public static final RegistrySupplier<Block> DRY_TORCH = BLOCKS.register("dry_bamboo_torch", () -> new TorchBlock(
-            BlockBehaviour.Properties.of(Material.DECORATION)
+            BlockBehaviour.Properties.of()
                     .noCollission()
                     .instabreak()
                     .lightLevel((x) -> 14)
                     .sound(SoundType.BAMBOO)
                     .noOcclusion()
             , ParticleTypes.FLAME));
     public static final RegistrySupplier<Block> DRY_WALL_TORCH = BLOCKS.register("dry_bamboo_wall_torch", () -> new WallTorchBlock(
-            BlockBehaviour.Properties.of(Material.DECORATION)
+            BlockBehaviour.Properties.of()
                     .noCollission()
                     .instabreak()
                     .lightLevel((x) -> 14)

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooBundleBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooBundleBlock.java
@@ -2,13 +2,13 @@
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooBundleBlock extends Block
 {
 
     public BambooBundleBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
+
                 .strength(1.0f, 2.0f)
                 .sound(SoundType.BAMBOO)
         );

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooDoorBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooDoorBlock.java
@@ -3,13 +3,12 @@
 import net.minecraft.world.level.block.DoorBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.properties.BlockSetType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooDoorBlock extends DoorBlock
 {
 
     public BambooDoorBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
                 .strength(3.0f, 3.0f)
                 .sound(SoundType.BAMBOO), BlockSetType.BAMBOO
         );

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooFenceBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooFenceBlock.java
@@ -2,13 +2,12 @@
 
 import net.minecraft.world.level.block.FenceBlock;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooFenceBlock extends FenceBlock
 {
 
     public BambooFenceBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
                 .strength(2.0f, 3.0f)
                 .sound(SoundType.BAMBOO)
         );

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooFenceGateBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooFenceGateBlock.java
@@ -3,13 +3,12 @@
 import net.minecraft.world.level.block.FenceGateBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.properties.WoodType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooFenceGateBlock extends FenceGateBlock
 {
 
     public BambooFenceGateBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
                 .strength(2.0f, 3.0f)
                 .sound(SoundType.BAMBOO),
                 WoodType.BAMBOO

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooLadderBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooLadderBlock.java
@@ -2,13 +2,12 @@
 
 import net.minecraft.world.level.block.LadderBlock;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooLadderBlock extends LadderBlock
 {
 
     public BambooLadderBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
                 .strength(0.4f)
                 .sound(SoundType.BAMBOO)
                 .noOcclusion()

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooSlabBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooSlabBlock.java
@@ -2,13 +2,12 @@
 
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooSlabBlock extends SlabBlock
 {
 
     public BambooSlabBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
                 .strength(1.0F, 2.0F)
                 .sound(SoundType.BAMBOO)
         );

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooStairsBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooStairsBlock.java
@@ -3,13 +3,12 @@
 import dev.wuffs.blocks.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.StairBlock;
-import net.minecraft.world.level.material.Material;
 
 public class BambooStairsBlock extends StairBlock
 {
 
     public BambooStairsBlock() {
-        super(Blocks.BUNDLE.get().defaultBlockState(), Properties.of(Material.BAMBOO)
+        super(Blocks.BUNDLE.get().defaultBlockState(), Properties.of()
                 .strength(1.0F, 2.0F)
                 .sound(SoundType.BAMBOO));
     }

diff --git a/common/src/main/java/dev/wuffs/blocks/block/BambooTrapDoorBlock.java b/common/src/main/java/dev/wuffs/blocks/block/BambooTrapDoorBlock.java
@@ -3,13 +3,12 @@
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.TrapDoorBlock;
 import net.minecraft.world.level.block.state.properties.BlockSetType;
-import net.minecraft.world.level.material.Material;
 
 public class BambooTrapDoorBlock extends TrapDoorBlock
 {
 
     public BambooTrapDoorBlock() {
-        super(Properties.of(Material.BAMBOO)
+        super(Properties.of()
                 .strength(3.0F, 3.0F)
                 .sound(SoundType.BAMBOO),
                 BlockSetType.BAMBOO

diff --git a/common/src/main/java/dev/wuffs/items/Items.java b/common/src/main/java/dev/wuffs/items/Items.java
@@ -17,7 +17,7 @@ public class Items {
     public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(BambooEverything.MOD_ID, Registries.ITEM);
 
     private static RegistrySupplier<Item> blockItem(String id, Supplier<Block> b) {
-        return ITEMS.register(id, () -> new BlockItem(b.get(), new Item.Properties().arch$tab(BambooEverything.CREATIVE_TAB)));
+        return ITEMS.register(id, () -> new BlockItem(b.get(), new Item.Properties()));
     }
 
     public static final RegistrySupplier<Item> BUNDLE = blockItem("bamboo_bundle", Blocks.BUNDLE);
@@ -44,8 +44,8 @@ private static RegistrySupplier<Item> blockItem(String id, Supplier<Block> b) {
     public static final RegistrySupplier<Item> TRAPDOOR = blockItem("bamboo_trapdoor", Blocks.TRAPDOOR);
     public static final RegistrySupplier<Item> DRY_TRAPDOOR = blockItem("dry_bamboo_trapdoor", Blocks.DRY_TRAPDOOR);
 
-    public static final RegistrySupplier<Item> TORCH = ITEMS.register("bamboo_torch", () -> new StandingAndWallBlockItem(Blocks.TORCH.get(), Blocks.WALL_TORCH.get(), (new Item.Properties()).arch$tab(BambooEverything.CREATIVE_TAB), Direction.DOWN));
-    public static final RegistrySupplier<Item> DRY_TORCH = ITEMS.register("dry_bamboo_torch", () -> new StandingAndWallBlockItem(Blocks.DRY_TORCH.get(), Blocks.DRY_WALL_TORCH.get(), (new Item.Properties()).arch$tab(BambooEverything.CREATIVE_TAB), Direction.DOWN));
+    public static final RegistrySupplier<Item> TORCH = ITEMS.register("bamboo_torch", () -> new StandingAndWallBlockItem(Blocks.TORCH.get(), Blocks.WALL_TORCH.get(), (new Item.Properties()), Direction.DOWN));
+    public static final RegistrySupplier<Item> DRY_TORCH = ITEMS.register("dry_bamboo_torch", () -> new StandingAndWallBlockItem(Blocks.DRY_TORCH.get(), Blocks.DRY_WALL_TORCH.get(), (new Item.Properties()), Direction.DOWN));
 
-    public static final RegistrySupplier<Item> DRY_BAMBOO = ITEMS.register("dry_bamboo", () -> new Item(new Item.Properties().arch$tab(BambooEverything.CREATIVE_TAB)));
+    public static final RegistrySupplier<Item> DRY_BAMBOO = ITEMS.register("dry_bamboo", () -> new Item(new Item.Properties()));
 }
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -40,19 +40,19 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    setArchiveClassifier("dev-shadow")
 }
 
 remapJar {
     injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
     archiveBaseName.set "${rootProject.archives_base_name}-${project.name}"
-    classifier null
+    setArchiveClassifier(null)
 }
 
 jar {
-    classifier "dev"
+    setArchiveClassifier("dev")
 }
 
 sourcesJar {

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   },
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.19.4",
-    "architectury": ">=8.1.79"
+    "minecraft": ">=1.20",
+    "architectury": ">=9.0.7"
   }
 }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -46,18 +46,18 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    setArchiveClassifier("dev-shadow")
 }
 
 remapJar {
     input.set shadowJar.archiveFile
     dependsOn shadowJar
     archiveBaseName.set "${rootProject.archives_base_name}-${project.name}"
-    classifier null
+    setArchiveClassifier(null)
 }
 
 jar {
-    classifier "dev"
+    setArchiveClassifier("dev")
 }
 
 sourcesJar {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[45,)"
+loaderVersion = "[46,)"
 #issueTrackerURL = ""
 license = "All rights reserved"
 
@@ -16,20 +16,20 @@ All things bamboo
 [[dependencies.bambooeverything]]
 modId = "forge"
 mandatory = true
-versionRange = "[43,)"
+versionRange = "[46,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.bambooeverything]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.4,)"
+versionRange = "[1.20,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.bambooeverything]]
 modId = "architectury"
 mandatory = true
-versionRange = "[8.1.79,)"
+versionRange = "[9.0.7,)"
 ordering = "AFTER"
 side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -1,18 +1,18 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.19.4
+minecraft_version=1.20
 enabled_platforms=fabric,forge
 
 archives_base_name=BambooEverything
-mod_version=2.4.1
+mod_version=3.0.0
 maven_group=dev.wuffs
 
-architectury_version=8.1.79
+architectury_version=9.0.7
 
-fabric_loader_version=0.14.19
-fabric_api_version=0.79.0+1.19.4
+fabric_loader_version=0.14.21
+fabric_api_version=0.83.0+1.20
 
-forge_version=1.19.4-45.0.49
+forge_version=1.20-46.0.2
 
 curseforge_id=331723
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        maven { url "https://maven.creeperhost.net/" }
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
         maven { url "https://maven.minecraftforge.net/" }