v1.3 - The woodening

DakotaPride · Nov 4, 2023 · 2d157e9 · 2d157e9
1 parent e3d602b
commit 2d157e9
Show file tree

Hide file tree

Showing 51 changed files with 756 additions and 4 deletions.
diff --git a/src/main/java/net/dakotapride/garnished/block/nut/NutButtonBlock.java b/src/main/java/net/dakotapride/garnished/block/nut/NutButtonBlock.java
@@ -0,0 +1,10 @@
+package net.dakotapride.garnished.block.nut;
+
+import net.dakotapride.garnished.registry.GarnishedSetTypes;
+import net.minecraft.world.level.block.ButtonBlock;
+
+public class NutButtonBlock extends ButtonBlock {
+    public NutButtonBlock(Properties pProperties) {
+        super(pProperties, GarnishedSetTypes.NUT, 30, true);
+    }
+}
diff --git a/src/main/java/net/dakotapride/garnished/block/nut/NutFenceGateBlock.java b/src/main/java/net/dakotapride/garnished/block/nut/NutFenceGateBlock.java
@@ -0,0 +1,10 @@
+package net.dakotapride.garnished.block.nut;
+
+import net.dakotapride.garnished.registry.GarnishedWoodTypes;
+import net.minecraft.world.level.block.FenceGateBlock;
+
+public class NutFenceGateBlock extends FenceGateBlock {
+    public NutFenceGateBlock(Properties pProperties) {
+        super(pProperties, GarnishedWoodTypes.NUT);
+    }
+}
diff --git a/src/main/java/net/dakotapride/garnished/block/nut/NutPressurePlateBlock.java b/src/main/java/net/dakotapride/garnished/block/nut/NutPressurePlateBlock.java
@@ -0,0 +1,10 @@
+package net.dakotapride.garnished.block.nut;
+
+import net.dakotapride.garnished.registry.GarnishedSetTypes;
+import net.minecraft.world.level.block.PressurePlateBlock;
+
+public class NutPressurePlateBlock extends PressurePlateBlock {
+    public NutPressurePlateBlock(Properties pProperties) {
+        super(Sensitivity.EVERYTHING, pProperties, GarnishedSetTypes.NUT);
+    }
+}
diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedBlocks.java
@@ -9,9 +9,12 @@
 import net.dakotapride.garnished.block.NutSackBlock;
 import net.dakotapride.garnished.block.SolidifiedGarnishBlock;
 import net.dakotapride.garnished.block.SoulPlantBlock;
+import net.dakotapride.garnished.block.nut.NutButtonBlock;
 import net.dakotapride.garnished.block.nut.NutDoorBlock;
+import net.dakotapride.garnished.block.nut.NutFenceGateBlock;
 import net.dakotapride.garnished.block.nut.NutHangingSignBlock;
 import net.dakotapride.garnished.block.nut.NutLogBlock;
+import net.dakotapride.garnished.block.nut.NutPressurePlateBlock;
 import net.dakotapride.garnished.block.nut.NutSignBlock;
 import net.dakotapride.garnished.block.nut.NutStairsBlock;
 import net.dakotapride.garnished.block.nut.NutTrapdoorBlock;
@@ -418,22 +421,46 @@ public class GarnishedBlocks {
 			REGISTRATE.block("nut_sign", NutSignBlock::new)
 					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
 					.initialProperties(() -> Blocks.OAK_SIGN)
-					.properties(p -> p.mapColor(MapColor.TERRACOTTA_BROWN)).register();
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
 	public static final BlockEntry<NutWallSignBlock> NUT_WALL_SIGN =
 			REGISTRATE.block("nut_wall_sign", NutWallSignBlock::new)
 					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
 					.initialProperties(() -> Blocks.OAK_WALL_SIGN)
-					.properties(p -> p.mapColor(MapColor.TERRACOTTA_BROWN)).register();
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
 	public static final BlockEntry<NutHangingSignBlock> NUT_HANGING_SIGN =
 			REGISTRATE.block("nut_hanging_sign", NutHangingSignBlock::new)
 					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
 					.initialProperties(() -> Blocks.OAK_HANGING_SIGN)
-					.properties(p -> p.mapColor(MapColor.TERRACOTTA_BROWN)).register();
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
 	public static final BlockEntry<NutWallHangingSignBlock> NUT_WALL_HANGING_SIGN =
 			REGISTRATE.block("nut_wall_hanging_sign", NutWallHangingSignBlock::new)
 					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
 					.initialProperties(() -> Blocks.OAK_WALL_HANGING_SIGN)
-					.properties(p -> p.mapColor(MapColor.TERRACOTTA_BROWN)).register();
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
+	public static final BlockEntry<FenceBlock> NUT_FENCE =
+			REGISTRATE.block("nut_fence", FenceBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.OAK_FENCE)
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
+	public static final BlockEntry<NutFenceGateBlock> NUT_FENCE_GATE =
+			REGISTRATE.block("nut_fence_gate", NutFenceGateBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.OAK_FENCE_GATE)
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
+	public static final BlockEntry<NutButtonBlock> NUT_BUTTON =
+			REGISTRATE.block("nut_button", NutButtonBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.OAK_BUTTON)
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
+	public static final BlockEntry<NutPressurePlateBlock> NUT_PRESSURE_PLATE =
+			REGISTRATE.block("nut_pressure_plate", NutPressurePlateBlock::new)
+					.blockstate((ctx, pov) -> pov.simpleBlock(ctx.get(), AssetLookup.standardModel(ctx, pov)))
+					.simpleItem()
+					.initialProperties(() -> Blocks.OAK_PRESSURE_PLATE)
+					.properties(p -> p.mapColor(MapColor.COLOR_LIGHT_GREEN)).register();
 
 	public static void setRegister() {}
 }
diff --git a/src/main/java/net/dakotapride/garnished/registry/GarnishedItems.java b/src/main/java/net/dakotapride/garnished/registry/GarnishedItems.java
@@ -1,6 +1,7 @@
 package net.dakotapride.garnished.registry;
 
 import com.simibubi.create.foundation.data.CreateRegistrate;
+import com.terraformersmc.terraform.boat.api.item.TerraformBoatItemHelper;
 import com.tterrag.registrate.util.entry.ItemEntry;
 
 import net.dakotapride.garnished.CreateGarnished;
@@ -426,6 +427,8 @@ public class GarnishedItems {
 	public static final ItemEntry<NutSignItem.Hanging> NUT_HANGING_SIGN =
 			REGISTRATE.item("nut_hanging_sign", NutSignItem.Hanging::new).register();
 
+	// v1.3
+
 	// Farmer's Delight Items
 	public static final ItemEntry<PecanPieSliceFoodItem> PECAN_PIE_SLICE =
 			REGISTRATE.item("pecan_pie_slice", PecanPieSliceFoodItem::new).register();

diff --git a/src/main/resources/assets/garnished/blockstates/nut_button.json b/src/main/resources/assets/garnished/blockstates/nut_button.json
@@ -0,0 +1,118 @@
+{
+  "variants": {
+    "face=ceiling,facing=east,powered=false": {
+      "model": "garnished:block/nut_button",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=east,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "x": 180,
+      "y": 270
+    },
+    "face=ceiling,facing=north,powered=false": {
+      "model": "garnished:block/nut_button",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=north,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "x": 180,
+      "y": 180
+    },
+    "face=ceiling,facing=south,powered=false": {
+      "model": "garnished:block/nut_button",
+      "x": 180
+    },
+    "face=ceiling,facing=south,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "x": 180
+    },
+    "face=ceiling,facing=west,powered=false": {
+      "model": "garnished:block/nut_button",
+      "x": 180,
+      "y": 90
+    },
+    "face=ceiling,facing=west,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "x": 180,
+      "y": 90
+    },
+    "face=floor,facing=east,powered=false": {
+      "model": "garnished:block/nut_button",
+      "y": 90
+    },
+    "face=floor,facing=east,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "y": 90
+    },
+    "face=floor,facing=north,powered=false": {
+      "model": "garnished:block/nut_button"
+    },
+    "face=floor,facing=north,powered=true": {
+      "model": "garnished:block/nut_button_pressed"
+    },
+    "face=floor,facing=south,powered=false": {
+      "model": "garnished:block/nut_button",
+      "y": 180
+    },
+    "face=floor,facing=south,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "y": 180
+    },
+    "face=floor,facing=west,powered=false": {
+      "model": "garnished:block/nut_button",
+      "y": 270
+    },
+    "face=floor,facing=west,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "y": 270
+    },
+    "face=wall,facing=east,powered=false": {
+      "model": "garnished:block/nut_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=east,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 90
+    },
+    "face=wall,facing=north,powered=false": {
+      "model": "garnished:block/nut_button",
+      "uvlock": true,
+      "x": 90
+    },
+    "face=wall,facing=north,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "uvlock": true,
+      "x": 90
+    },
+    "face=wall,facing=south,powered=false": {
+      "model": "garnished:block/nut_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=south,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 180
+    },
+    "face=wall,facing=west,powered=false": {
+      "model": "garnished:block/nut_button",
+      "uvlock": true,
+      "x": 90,
+      "y": 270
+    },
+    "face=wall,facing=west,powered=true": {
+      "model": "garnished:block/nut_button_pressed",
+      "uvlock": true,
+      "x": 90,
+      "y": 270
+    }
+  }
+}
diff --git a/src/main/resources/assets/garnished/blockstates/nut_fence.json b/src/main/resources/assets/garnished/blockstates/nut_fence.json
@@ -0,0 +1,48 @@
+{
+  "multipart": [
+    {
+      "apply": {
+        "model": "garnished:block/nut_fence_post"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/nut_fence_side",
+        "uvlock": true
+      },
+      "when": {
+        "north": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/nut_fence_side",
+        "uvlock": true,
+        "y": 90
+      },
+      "when": {
+        "east": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/nut_fence_side",
+        "uvlock": true,
+        "y": 180
+      },
+      "when": {
+        "south": "true"
+      }
+    },
+    {
+      "apply": {
+        "model": "garnished:block/nut_fence_side",
+        "uvlock": true,
+        "y": 270
+      },
+      "when": {
+        "west": "true"
+      }
+    }
+  ]
+}
diff --git a/src/main/resources/assets/garnished/blockstates/nut_fence_gate.json b/src/main/resources/assets/garnished/blockstates/nut_fence_gate.json
@@ -0,0 +1,80 @@
+{
+  "variants": {
+    "facing=east,in_wall=false,open=false": {
+      "model": "garnished:block/nut_fence_gate",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=false,open=true": {
+      "model": "garnished:block/nut_fence_gate_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=false": {
+      "model": "garnished:block/nut_fence_gate_wall",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=east,in_wall=true,open=true": {
+      "model": "garnished:block/nut_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 270
+    },
+    "facing=north,in_wall=false,open=false": {
+      "model": "garnished:block/nut_fence_gate",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=false,open=true": {
+      "model": "garnished:block/nut_fence_gate_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=false": {
+      "model": "garnished:block/nut_fence_gate_wall",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=north,in_wall=true,open=true": {
+      "model": "garnished:block/nut_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 180
+    },
+    "facing=south,in_wall=false,open=false": {
+      "model": "garnished:block/nut_fence_gate",
+      "uvlock": true
+    },
+    "facing=south,in_wall=false,open=true": {
+      "model": "garnished:block/nut_fence_gate_open",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=false": {
+      "model": "garnished:block/nut_fence_gate_wall",
+      "uvlock": true
+    },
+    "facing=south,in_wall=true,open=true": {
+      "model": "garnished:block/nut_fence_gate_wall_open",
+      "uvlock": true
+    },
+    "facing=west,in_wall=false,open=false": {
+      "model": "garnished:block/nut_fence_gate",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=false,open=true": {
+      "model": "garnished:block/nut_fence_gate_open",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=false": {
+      "model": "garnished:block/nut_fence_gate_wall",
+      "uvlock": true,
+      "y": 90
+    },
+    "facing=west,in_wall=true,open=true": {
+      "model": "garnished:block/nut_fence_gate_wall_open",
+      "uvlock": true,
+      "y": 90
+    }
+  }
+}
diff --git a/src/main/resources/assets/garnished/blockstates/nut_pressure_plate.json b/src/main/resources/assets/garnished/blockstates/nut_pressure_plate.json
@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "powered=false": {
+      "model": "garnished:block/nut_pressure_plate"
+    },
+    "powered=true": {
+      "model": "garnished:block/nut_pressure_plate_down"
+    }
+  }
+}