Merge pull request #33 from BTW-Community/feature/decorative

Feature/decorative
BTW-Community · Dec 2, 2024 · 17c43fb · 17c43fb
2 parents 89695fb + e2d070a
commit 17c43fb
Show file tree

Hide file tree

Showing 226 changed files with 8,634 additions and 474 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ src/btw/**
 **/run/
 
 /release
+/libs
diff --git a/build.gradle b/build.gradle
@@ -66,8 +66,12 @@ dependencies {
     modImplementation("io.github.minecraft-cursed-legacy:cursed-fabric-loader:${loader_version}") {
         transitive false
     }
+
+    compileOnly fileTree(dir: "libs", include: "Deco-Addon-4.1.2.jar")
 }
 
+
+
 loom {
     accessWidener = file("src/main/resources/sockscrops.accesswidener")
 }

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version = 1.5.2
 yarn_mappings = 1.5.2+build.202201092137
 loader_version = 1.0.0
 
-mod_version = 2.0.0
+mod_version = 2.0.0 Prerelease 1
 maven_group = net.fabricmc
 archives_base_name = socks-crops-addon
 

diff --git a/src/main/java/btw/community/sockthing/sockscrops/SocksCropsAddon.java b/src/main/java/btw/community/sockthing/sockscrops/SocksCropsAddon.java
@@ -52,5 +52,17 @@ public static SocksCropsAddon getInstance() {
         return instance;
     }
 
+    public static boolean isDecoInstalled() {
+        return AddonHandler.isModInstalled("Deco Addon");
+    }
+
+    public static boolean isBTAInstalled() {
+        return AddonHandler.isModInstalled("Better Terrain");
+    }
+
+    public static boolean isBBInstalled() {
+        return AddonHandler.isModInstalled("Better Biomes");
+    }
+
 
 }
diff --git a/src/main/java/btw/community/sockthing/sockscrops/block/SCBlockIDs.java b/src/main/java/btw/community/sockthing/sockscrops/block/SCBlockIDs.java
@@ -2,43 +2,95 @@
 
 public class SCBlockIDs {
 
+//2600 - 2629 Nutrition
+//2630 - 2049 Planters
+//2650 - 2689 Plants
+//2690 - 2694 Moss
+//2695 - 2699 Hollow Logs
+//2700 - 2704 Berries
+//2705 - 2799 Crops
+//2800 - 2849 Misc
+//2850 - 2899 Tile Entities
+
+
     //----------- Grass -----------//
-    public static final int GRASS_NUTRITION_ID = 2625;
+    public static final int GRASS_NUTRITION_ID = 2600;
 
     //----------- Farmland -----------//
-    public static final int FARMLAND_FULL_NUTRITION_ID = 2626;
-    public static final int FARMLAND_REDUCED_NUTRITION_ID = 2627;
-    public static final int FARMLAND_LOW_NUTRITION_ID = 2628;
-    public static final int FARMLAND_DEPLETED_NUTRITION_ID = 2629;
-
-    public static final int FARMLAND_FERTILIZED_FULL_NUTRITION_ID = 2630;
-    public static final int FARMLAND_FERTILIZED_REDUCED_NUTRITION_ID = 2631;
-    public static final int FARMLAND_FERTILIZED_LOW_NUTRITION_ID = 2632;
-    public static final int FARMLAND_FERTILIZED_DEPLETED_NUTRITION_ID = 2633;
-
-    public static final int FARMLAND_DUNG_FULL_NUTRITION_ID = 2634;
-    public static final int FARMLAND_DUNG_REDUCED_NUTRITION_ID = 2635;
-    public static final int FARMLAND_DUNG_LOW_NUTRITION_ID = 2636;
-    public static final int FARMLAND_DUNG_DEPLETED_NUTRITION_ID = 2637;
-
-    public static final int FARMLAND_MULCH_FULL_NUTRITION_ID = 2638;
-    public static final int FARMLAND_MULCH_REDUCED_NUTRITION_ID = 2639;
-    public static final int FARMLAND_MULCH_LOW_NUTRITION_ID = 2640;
-    public static final int FARMLAND_MULCH_DEPLETED_NUTRITION_ID = 2641;
+    public static final int FARMLAND_FULL_NUTRITION_ID = 2601;
+    public static final int FARMLAND_REDUCED_NUTRITION_ID = 2602;
+    public static final int FARMLAND_LOW_NUTRITION_ID = 2603;
+    public static final int FARMLAND_DEPLETED_NUTRITION_ID = 2604;
 
-    //----------- Planters  -----------//
-    public static final int GRASS_PLANTER_ID = 2646;
-    public static final int FARMLAND_PLANTER_ID = 2647;
-    public static final int FERTILIZED_PLANTER_ID = 2648;
-    public static final int DUNG_PLANTER_ID = 2649;
+    public static final int FARMLAND_FERTILIZED_FULL_NUTRITION_ID = 2605;
+    public static final int FARMLAND_FERTILIZED_REDUCED_NUTRITION_ID = 2606;
+    public static final int FARMLAND_FERTILIZED_LOW_NUTRITION_ID = 2607;
+    public static final int FARMLAND_FERTILIZED_DEPLETED_NUTRITION_ID = 2608;
+
+    public static final int FARMLAND_DUNG_FULL_NUTRITION_ID = 2609;
+    public static final int FARMLAND_DUNG_REDUCED_NUTRITION_ID = 2610;
+    public static final int FARMLAND_DUNG_LOW_NUTRITION_ID = 2611;
+    public static final int FARMLAND_DUNG_DEPLETED_NUTRITION_ID = 2612;
+
+    public static final int FARMLAND_MULCH_FULL_NUTRITION_ID = 2613;
+    public static final int FARMLAND_MULCH_REDUCED_NUTRITION_ID = 2614;
+    public static final int FARMLAND_MULCH_LOW_NUTRITION_ID = 2615;
+    public static final int FARMLAND_MULCH_DEPLETED_NUTRITION_ID = 2616;
 
     //----------- Planters  -----------//
-    public static final int DOUBLE_TALL_GRASS_ID = 2657;
+    public static final int GRASS_PLANTER_ID = 2630;
+    public static final int FARMLAND_PLANTER_ID = 2631;
+    public static final int FERTILIZED_PLANTER_ID = 2632;
+    public static final int DUNG_PLANTER_ID = 2633;
+
+    //----------- Plants  -----------//
+    public static final int CLOVER_ID = 2650;
+    public static final int PURPLE_CLOVER_ID = 2651;
+    public static final int WHITE_CLOVER_ID = 2652;
+    public static final int RED_CLOVER_ID = 2653;
+    public static final int MUTLIFLOWER_ID = 2654;
+    public static final int SIDESHROOM_ID = 2655;
+    public static final int SHORT_GRASS_ID = 2656;
+    public static final int DOUBLE_TALL_PLANT_ID = 2657; //overlap with deco
+    public static final int DOUBLE_TALL_FLOWER_ID = 2658;
+    public static final int SHORT_WATER_PLANT_ID = 2659;
+    public static final int TALL_WATER_PLANT_ID = 2660;
+    public static final int FLOWER_LILY_ID = 2661;
+
+    public static final int WICKER_GROWN_ID = 2680;
+    public static final int GRATE_GROWN_ID = 2681;
+    public static final int SLATS_GROWN_ID = 2682;
+    public static final int IRON_BARS_GROWN_ID = 2683;
+    public static final int WROUGHT_BARS_GROWN_ID = 2684;
+
+    public static final int MOSS_CARPET_ID = 2690;
+    public static final int MOSS_BLOCK_ID = 2691;
+
+    //----------- Hollow Logs  -----------//
+    public static final int HOLLOW_LOG_ID = 2695;
+    public static final int HOLLOW_LOG_2_ID = 2696;
+    public static final int DECO_HOLLOW_LOG_ID = 2697;
+    public static final int DECO_HOLLOW_LOG_2_ID = 2698;
+    public static final int DECO_HOLLOW_LOG_3_ID = 2699;
+
+    //----------- Bushes  -----------//
+    public static final int SWEETBERRY_BUSH_ID = 2700;
+    public static final int BLUEBERRY_BUSH_ID = 2701;
+
+    //----------- Sunflower  -----------//
+    public static final int SUNFLOWER_CROP_ID = 2705;
+    public static final int SUNFLOWER_CROP_TOP_ID = 2706;
 
     //----------- Hay  -----------//
-    public static final int DRYING_HAY_ID = 2825;
-    public static final int DRIED_HAY_ID = 2826;
-    public static final int HAY_BALE_ID = 2827;
-    public static final int STRAW_BALE_ID = 3025; // copy of deco, ID overlap
+    public static final int DRYING_HAY_ID = 2800;
+    public static final int DRIED_HAY_ID = 2801;
+    public static final int HAY_BALE_ID = 2802;
+    public static final int SMALL_PACKED_BLOCK_ID = 2803;
+
+    public static final int LARGE_FLOWERPOT_ID = 2805;
+    public static final int FLOWERPOT_ID = 2806;
+
+    //----------- Deco Overlap  -----------//
+    public static final int STRAW_BALE_ID = 3025;
 
 }