1.20.1

3.3.5 Add BiomeMakeover support Add recipe support for Macaws Trapdoors & Reinforced Barrels (Copper Barrel) Removed erroneous tag entry for blockus barrels
xanthian · Nov 21, 2023 · e3f7532 · e3f7532
1 parent 0da593a
commit e3f7532
Show file tree

Hide file tree

Showing 71 changed files with 1,229 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -79,6 +79,9 @@ dependencies {
 	// BetterArcheology
 	modRuntimeOnly("curse.maven:betterarcheology-835687:4600694") {transitive false}
 
+	// Biome Makeover
+	//modRuntimeOnly("curse.maven:biome-makeover-412182:4815823")
+
 	// Bewitchment
 	modRuntimeOnly("curse.maven:bewitchment-394915:4673611") {transitive false}
 	modApi("me.lucko:fabric-permissions-api:0.1-SNAPSHOT")

diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,6 @@ loader_version=0.14.24
 #Fabric api
 fabric_version=0.90.7+1.20.1
 # Mod Properties
-mod_version=3.3
+mod_version=3.3.5
 maven_group=xanthian
 archives_base_name=variantbarrels
diff --git a/src/main/generated/assets/variantbarrels/blockstates/bm_ancient_oak_barrel.json b/src/main/generated/assets/variantbarrels/blockstates/bm_ancient_oak_barrel.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,open=false": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel",
+      "x": 180
+    },
+    "facing=down,open=true": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel_open",
+      "x": 180
+    },
+    "facing=east,open=false": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,open=true": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel_open",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,open=false": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel",
+      "x": 90
+    },
+    "facing=north,open=true": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel_open",
+      "x": 90
+    },
+    "facing=south,open=false": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,open=true": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel_open",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,open=false": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel"
+    },
+    "facing=up,open=true": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel_open"
+    },
+    "facing=west,open=false": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,open=true": {
+      "model": "variantbarrels:block/bm_ancient_oak_barrel_open",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/blockstates/bm_blighted_balsa_barrel.json b/src/main/generated/assets/variantbarrels/blockstates/bm_blighted_balsa_barrel.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,open=false": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel",
+      "x": 180
+    },
+    "facing=down,open=true": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel_open",
+      "x": 180
+    },
+    "facing=east,open=false": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,open=true": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel_open",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,open=false": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel",
+      "x": 90
+    },
+    "facing=north,open=true": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel_open",
+      "x": 90
+    },
+    "facing=south,open=false": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,open=true": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel_open",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,open=false": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel"
+    },
+    "facing=up,open=true": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel_open"
+    },
+    "facing=west,open=false": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,open=true": {
+      "model": "variantbarrels:block/bm_blighted_balsa_barrel_open",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/blockstates/bm_swamp_cypress_barrel.json b/src/main/generated/assets/variantbarrels/blockstates/bm_swamp_cypress_barrel.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,open=false": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel",
+      "x": 180
+    },
+    "facing=down,open=true": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel_open",
+      "x": 180
+    },
+    "facing=east,open=false": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,open=true": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel_open",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,open=false": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel",
+      "x": 90
+    },
+    "facing=north,open=true": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel_open",
+      "x": 90
+    },
+    "facing=south,open=false": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,open=true": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel_open",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,open=false": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel"
+    },
+    "facing=up,open=true": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel_open"
+    },
+    "facing=west,open=false": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,open=true": {
+      "model": "variantbarrels:block/bm_swamp_cypress_barrel_open",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/blockstates/bm_willow_barrel.json b/src/main/generated/assets/variantbarrels/blockstates/bm_willow_barrel.json
@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,open=false": {
+      "model": "variantbarrels:block/bm_willow_barrel",
+      "x": 180
+    },
+    "facing=down,open=true": {
+      "model": "variantbarrels:block/bm_willow_barrel_open",
+      "x": 180
+    },
+    "facing=east,open=false": {
+      "model": "variantbarrels:block/bm_willow_barrel",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,open=true": {
+      "model": "variantbarrels:block/bm_willow_barrel_open",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,open=false": {
+      "model": "variantbarrels:block/bm_willow_barrel",
+      "x": 90
+    },
+    "facing=north,open=true": {
+      "model": "variantbarrels:block/bm_willow_barrel_open",
+      "x": 90
+    },
+    "facing=south,open=false": {
+      "model": "variantbarrels:block/bm_willow_barrel",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,open=true": {
+      "model": "variantbarrels:block/bm_willow_barrel_open",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,open=false": {
+      "model": "variantbarrels:block/bm_willow_barrel"
+    },
+    "facing=up,open=true": {
+      "model": "variantbarrels:block/bm_willow_barrel_open"
+    },
+    "facing=west,open=false": {
+      "model": "variantbarrels:block/bm_willow_barrel",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,open=true": {
+      "model": "variantbarrels:block/bm_willow_barrel_open",
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/lang/en_us.json b/src/main/generated/assets/variantbarrels/lang/en_us.json
@@ -7,6 +7,10 @@
   "block.variantbarrels.ba_rotten_barrel": "Rotten Barrel",
   "block.variantbarrels.bamboo_barrel": "Bamboo Barrel",
   "block.variantbarrels.birch_barrel": "Birch Barrel",
+  "block.variantbarrels.bm_ancient_oak_barrel": "Ancient Oak Barrel",
+  "block.variantbarrels.bm_blighted_balsa_barrel": "Blighted Balsa Barrel",
+  "block.variantbarrels.bm_swamp_cypress_barrel": "Swamp Cypress Barrel",
+  "block.variantbarrels.bm_willow_barrel": "Willow Barrel",
   "block.variantbarrels.bw_cypress_barrel": "Cypress Barrel",
   "block.variantbarrels.bw_dragons_blood_barrel": "Dragons Blood Barrel",
   "block.variantbarrels.bw_elder_barrel": "Elder Barrel",

diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_ancient_oak_barrel.json b/src/main/generated/assets/variantbarrels/models/block/bm_ancient_oak_barrel.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_ancient_oak_barrel_bottom",
+    "side": "variantbarrels:block/bm_ancient_oak_barrel_side",
+    "top": "variantbarrels:block/bm_ancient_oak_barrel_top"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_ancient_oak_barrel_open.json b/src/main/generated/assets/variantbarrels/models/block/bm_ancient_oak_barrel_open.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_ancient_oak_barrel_bottom",
+    "side": "variantbarrels:block/bm_ancient_oak_barrel_side",
+    "top": "variantbarrels:block/bm_ancient_oak_barrel_top_open"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_blighted_balsa_barrel.json b/src/main/generated/assets/variantbarrels/models/block/bm_blighted_balsa_barrel.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_blighted_balsa_barrel_bottom",
+    "side": "variantbarrels:block/bm_blighted_balsa_barrel_side",
+    "top": "variantbarrels:block/bm_blighted_balsa_barrel_top"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_blighted_balsa_barrel_open.json b/src/main/generated/assets/variantbarrels/models/block/bm_blighted_balsa_barrel_open.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_blighted_balsa_barrel_bottom",
+    "side": "variantbarrels:block/bm_blighted_balsa_barrel_side",
+    "top": "variantbarrels:block/bm_blighted_balsa_barrel_top_open"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_swamp_cypress_barrel.json b/src/main/generated/assets/variantbarrels/models/block/bm_swamp_cypress_barrel.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_swamp_cypress_barrel_bottom",
+    "side": "variantbarrels:block/bm_swamp_cypress_barrel_side",
+    "top": "variantbarrels:block/bm_swamp_cypress_barrel_top"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_swamp_cypress_barrel_open.json b/src/main/generated/assets/variantbarrels/models/block/bm_swamp_cypress_barrel_open.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_swamp_cypress_barrel_bottom",
+    "side": "variantbarrels:block/bm_swamp_cypress_barrel_side",
+    "top": "variantbarrels:block/bm_swamp_cypress_barrel_top_open"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_willow_barrel.json b/src/main/generated/assets/variantbarrels/models/block/bm_willow_barrel.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_willow_barrel_bottom",
+    "side": "variantbarrels:block/bm_willow_barrel_side",
+    "top": "variantbarrels:block/bm_willow_barrel_top"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/block/bm_willow_barrel_open.json b/src/main/generated/assets/variantbarrels/models/block/bm_willow_barrel_open.json
@@ -0,0 +1,8 @@
+{
+  "parent": "minecraft:block/cube_bottom_top",
+  "textures": {
+    "bottom": "variantbarrels:block/bm_willow_barrel_bottom",
+    "side": "variantbarrels:block/bm_willow_barrel_side",
+    "top": "variantbarrels:block/bm_willow_barrel_top_open"
+  }
+}
diff --git a/src/main/generated/assets/variantbarrels/models/item/bm_ancient_oak_barrel.json b/src/main/generated/assets/variantbarrels/models/item/bm_ancient_oak_barrel.json
@@ -0,0 +1,3 @@
+{
+  "parent": "variantbarrels:block/bm_ancient_oak_barrel"
+}
diff --git a/src/main/generated/assets/variantbarrels/models/item/bm_blighted_balsa_barrel.json b/src/main/generated/assets/variantbarrels/models/item/bm_blighted_balsa_barrel.json
@@ -0,0 +1,3 @@
+{
+  "parent": "variantbarrels:block/bm_blighted_balsa_barrel"
+}
diff --git a/src/main/generated/assets/variantbarrels/models/item/bm_swamp_cypress_barrel.json b/src/main/generated/assets/variantbarrels/models/item/bm_swamp_cypress_barrel.json
@@ -0,0 +1,3 @@
+{
+  "parent": "variantbarrels:block/bm_swamp_cypress_barrel"
+}
diff --git a/src/main/generated/assets/variantbarrels/models/item/bm_willow_barrel.json b/src/main/generated/assets/variantbarrels/models/item/bm_willow_barrel.json
@@ -0,0 +1,3 @@
+{
+  "parent": "variantbarrels:block/bm_willow_barrel"
+}
diff --git a/src/main/generated/data/minecraft/tags/items/non_flammable_wood.json b/src/main/generated/data/minecraft/tags/items/non_flammable_wood.json
@@ -3,18 +3,6 @@
   "values": [
     "variantbarrels:crimson_barrel",
     "variantbarrels:warped_barrel",
-    {
-      "id": "variantcraftingtables:bls_herringbone_charred_barrel",
-      "required": false
-    },
-    {
-      "id": "variantcraftingtables:bls_herringbone_crimson_barrel",
-      "required": false
-    },
-    {
-      "id": "variantcraftingtables:bls_herringbone_warped_barrel",
-      "required": false
-    },
     {
       "id": "variantbarrels:prom_dark_amaranth_barrel",
       "required": false