1.01-1.21.8-beta - merge

middle-earth/build.gradle

@@ -1,12 +1,14 @@
 repositories {
     maven { url "https://maven.shedaniel.me" }
+    mavenCentral()
 }
 
 dependencies {
     implementation project(path: ':sevenstars-api', configuration: 'dev')
     implementation project(path: ':of-beasts-and-wild-things', configuration: 'dev')
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:20.0.811"
     modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:20.0.811"
+    modImplementation(include("me.lucko:fabric-permissions-api:0.4.0"))
 }
 
 loom {

middle-earth/gradle.properties

@@ -14,7 +14,7 @@ loom_version=1.11-SNAPSHOT
 fabric_version=0.129.0+1.21.8
 
 # Mod Properties
-mod_version = 1.0.0-1.21.8-beta-dev
+mod_version = 1.0.1-1.21.8-beta
 maven_group = net.sevenstars.middleearth
 archives_base_name = Middle-earth
 

middle-earth/src/main/java/net/sevenstars/middleearth/MiddleEarth.java

@@ -43,7 +43,7 @@
 public class MiddleEarth implements ModInitializer {
 	public static final String MOD_ID = "middle-earth";
 	public static final String OLD_MOD_ID = "me";
-	public static final String MOD_VERSION = "1.0.0-1.21.8-beta-dev";
+	public static final String MOD_VERSION = "1.0.0-1.21.8-beta";
 	public static final boolean IS_DEBUG = true;
 	public static final boolean ENABLE_INSTANT_BOOTING = true;
 	public static final ModLogger LOGGER = new ModLogger(MOD_ID, IS_DEBUG);
@@ -175,4 +175,8 @@ public static Identifier append(Identifier base, String suffix) {
     public static String createAggregate(char splitter, String... names){
         return IdentifierUtil.createAggregateValue(splitter, names);
     }
+
+	public static boolean compareId(Identifier id1, Identifier id2) {
+		return id1.compareTo(id2) == 0;
+	}
 }

middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/GenericBlockSets.java

@@ -225,74 +225,74 @@ public class GenericBlockSets {
             ItemGroupsME.STONE_BLOCKS_CONTENTS));
 
     public static GenericBlockSetBuilder WEATHERED_SHINGLES = registerBlockSet(new GenericBlockSetBuilder(
-            "weathered_shingles", 2.0f, 3.0f, MapColor.WHITE_GRAY, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "weathered_shingles", 2.0f, 3.0f, MapColor.WHITE_GRAY, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
 
     public static GenericBlockSetBuilder TREATED_WOOD = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "treated_wood", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "treated_wood", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder TREATED_WOOD_PLANKS = registerBlockSet(new GenericBlockSetBuilder(
-            "treated_wood_planks", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "treated_wood_planks", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder TREATED_WOOD_BEAM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "treated_wood_beam", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "treated_wood_beam", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder TREATED_WOOD_CARVED_BEAM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "treated_wood_carved_beam", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "treated_wood_carved_beam", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder TREATED_WOOD_PANELS = registerBlockSet(new GenericBlockSetBuilder(
-            "treated_wood_panels", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "treated_wood_panels", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder TREATED_WOOD_TILING = registerBlockSet(new GenericBlockSetBuilder(
-            "treated_wood_tiling", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "treated_wood_tiling", 2.0f, 3.0f, MapColor.SPRUCE_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
 
     public static GenericBlockSetBuilder AGED_WOOD = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_BOARDS = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_boards", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_boards", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_CARVING = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_carving", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_carving", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_PLANKS = registerBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_planks", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_planks", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_BEAM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_FISH_CARVING = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_fish_carving", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_fish_carving", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_PANELS = registerBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_panels", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_panels", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_SHINGLES = registerBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_shingles", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_shingles", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
 
     public static GenericBlockSetBuilder AGED_WOOD_CARVED_BEAM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_carved_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_carved_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_KNOTTED_BEAM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_knotted_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_knotted_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_REDDISH_BEAM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_reddish_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_reddish_beam", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
 
     public static GenericBlockSetBuilder AGED_WOOD_GILDED_CARVED_PILLAR = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_gilded_carved_pillar", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_gilded_carved_pillar", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_GILDED_CARVING = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_gilded_carving", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_gilded_carving", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_GILDED_HORSES = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_gilded_horses", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_gilded_horses", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
     public static GenericBlockSetBuilder AGED_WOOD_GILDED_TRIM = registerPillarBlockSet(new GenericBlockSetBuilder(
-            "aged_wood_gilded_trim", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, false,
+            "aged_wood_gilded_trim", 2.0f, 3.0f, MapColor.TERRACOTTA_BROWN, NoteBlockInstrument.BASS, BlockSoundGroup.WOOD, true,
             ItemGroupsME.WOOD_BLOCKS_CONTENTS));
 
     public static OxidizableBlockSetBuilder THATCH = registerOxidizableBlockSet(new OxidizableBlockSetBuilder(

middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/ModNatureBlocks.java

@@ -327,10 +327,10 @@ public class ModNatureBlocks {
 
     public static final Block SHORT_CATTAILS = registerBlock("short_cattails",
             CustomPlantBlock::new, AbstractBlock.Settings.copy(Blocks.SHORT_GRASS).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS).offset(AbstractBlock.OffsetType.XYZ)
-                    .mapColor(DyeColor.GREEN), true);
+                    .mapColor(MapColor.TERRACOTTA_BROWN), true);
     public static final Block SHORT_BULRUSH = registerBlock("short_bulrush",
             CustomPlantBlock::new, AbstractBlock.Settings.copy(Blocks.SHORT_GRASS).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS).offset(AbstractBlock.OffsetType.XYZ)
-                    .mapColor(DyeColor.GREEN), true);
+                    .mapColor(MapColor.TERRACOTTA_BROWN), true);
 
     public static final Block TALL_CATTAILS = registerBlock("tall_cattails",
             (settings) -> new CustomWaterloggableTallPlantBlock(settings, false), AbstractBlock.Settings.copy(Blocks.TALL_GRASS).breakInstantly(), true);
@@ -633,6 +633,7 @@ public static Block registerVariantSapling(String name, List<RegistryKey<Configu
 
         registerBlockItem(name, resultBlock);
         TintableCrossModel.notTintedBlocks.add(resultBlock);
+        Saplings.saplings.add(resultBlock);
         RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.BLOCK, name));
 
         return resultBlock;
@@ -647,6 +648,7 @@ public static Block registerWeightedSapling(String name, List<WeightedSaplingBlo
 
         registerBlockItem(name, resultBlock);
         TintableCrossModel.notTintedBlocks.add(resultBlock);
+        Saplings.saplings.add(resultBlock);
         RegistryAliasesME.aliases.add(new RegistryAliasesME.Alias(Registries.BLOCK, name));
 
         return resultBlock;

middle-earth/src/main/java/net/sevenstars/middleearth/block/registration/OreRockSets.java

@@ -114,7 +114,7 @@ public static OreRockSet registerOreSet(String rockName, float strength_mult, Li
 
         if(ores.contains(ORES.SILVER_ORE)) {
             silver_ore = ModNatureBlocks.registerBlock(
-                    rockName + "silver_ore", Block::new, AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(
+                    rockName + "silver_ore", Block::new, AbstractBlock.Settings.copy(Blocks.GOLD_ORE).strength(
                             STONE_STRENGTH * strength_mult, 3*strength_mult).requiresTool(), true);
         }
 
@@ -132,31 +132,31 @@ public static OreRockSet registerOreSet(String rockName, float strength_mult, Li
 
         if(ores.contains(ORES.EMERALD_ORE)) {
             emerald_ore = ModNatureBlocks.registerBlock(
-                    rockName + "emerald_ore", Block::new, AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(
+                    rockName + "emerald_ore", Block::new, AbstractBlock.Settings.copy(Blocks.EMERALD_ORE).strength(
                             STONE_STRENGTH * strength_mult, 3*strength_mult).requiresTool(), true);
         }
 
         if(ores.contains(ORES.RUBY_ORE)) {
             ruby_ore = ModNatureBlocks.registerBlock(
-                    rockName + "ruby_ore", Block::new, AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(
+                    rockName + "ruby_ore", Block::new, AbstractBlock.Settings.copy(Blocks.EMERALD_ORE).strength(
                             STONE_STRENGTH * strength_mult, 3*strength_mult).requiresTool(), true);
         }
 
         if(ores.contains(ORES.SAPPHIRE_ORE)) {
             sapphire_ore = ModNatureBlocks.registerBlock(
-                    rockName + "sapphire_ore", Block::new, AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(
+                    rockName + "sapphire_ore", Block::new, AbstractBlock.Settings.copy(Blocks.EMERALD_ORE).strength(
                             STONE_STRENGTH * strength_mult, 3*strength_mult).requiresTool(), true);
         }
 
         if(ores.contains(ORES.ADAMANT_ORE)) {
             adamant_ore = ModNatureBlocks.registerBlock(
-                    rockName + "adamant_ore", Block::new, AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(
+                    rockName + "adamant_ore", Block::new, AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).strength(
                             STONE_STRENGTH * strength_mult, 3*strength_mult).requiresTool(), true);
         }
 
         if(ores.contains(ORES.MITHRIL_ORE)) {
             mithril_ore = ModNatureBlocks.registerBlock(
-                    rockName + "mithril_ore", Block::new, AbstractBlock.Settings.copy(Blocks.IRON_ORE).strength(
+                    rockName + "mithril_ore", Block::new, AbstractBlock.Settings.copy(Blocks.DIAMOND_ORE).strength(
                             STONE_STRENGTH * strength_mult, 3*strength_mult).requiresTool(), true);
         }