Remove system specific java home path from gradle.properties

README.md

@@ -0,0 +1,143 @@
+# Decocraft Pack Template
+
+Universal addon pack for Decocraft. No Java code needed.
+Single jar works on both NeoForge and Fabric.
+
+## Quick Start
+
+1. Clone this repo
+2. Edit `gradle.properties` - change `mod_id`, `mod_name`, `mod_description`, `mod_authors`
+3. Edit `settings.gradle` - change `rootProject.name`
+4. Rename `src/main/resources/assets/decocraft/mypack.json` to your pack name
+5. Update `decocraft.json` to point to your renamed file and `groups.json`
+6. Edit `groups.json` to define your creative tabs
+7. Add your content (see below)
+8. `./gradlew build` - jar goes to `build/libs/`
+
+The output jar contains both `fabric.mod.json` and `META-INF/neoforge.mods.toml`,
+so it loads on either mod loader without separate builds.
+
+## File Structure
+
+```
+assets/decocraft/
+    decocraft.json                    - manifest: lists groups.json + your content files
+    groups.json                       - creative tab definitions
+    mypack.json                       - block/item definitions
+    models/bbmodel/{model}.bbmodel    - BlockBench 3D models
+    textures/block/{material}.png     - block textures
+    textures/item/{material}.png      - item/inventory textures
+    lang/en_us.json                   - display names + tab labels
+```
+
+All assets go under the `decocraft` namespace.
+
+Blockstates, block models, item models, item definitions, and loot tables
+are all generated dynamically at runtime by the main Decocraft mod.
+You do NOT need to create these files.
+
+## Per Block Checklist
+
+For each block you add, you need:
+
+| File | Purpose |
+|------|---------|
+| `mypack.json` | Entry in the `models` array |
+| `models/bbmodel/{model}.bbmodel` | BlockBench 3D model |
+| `textures/block/{material}.png` | Block texture |
+| `textures/item/{material}.png` | Item texture |
+| `lang/en_us.json` | `"block.decocraft.{decoref}": "Display Name"` |
+
+That is it. Everything else is handled automatically.
+
+## Manifest (decocraft.json)
+
+Simple array listing files to load. Include `groups.json` first:
+
+```json
+[
+    "groups.json",
+    "mypack.json"
+]
+```
+
+Decocraft merges manifests from all jars, so your pack's files are loaded
+alongside the base decocraft files.
+
+## Creative Tabs (groups.json)
+
+Declare tabs with a translation key and icon block:
+
+```json
+{
+    "my_tab": { "label": "itemGroup.decocraft.my_tab", "icon": "some_block_id" }
+}
+```
+
+Then add the display name in `lang/en_us.json`:
+
+```json
+"itemGroup.decocraft.my_tab": "Decocraft - My Tab"
+```
+
+The `icon` must match a block's `decoref` from your content JSON. Tabs from
+all packs are merged. If the base decocraft already defines a tab key, your
+blocks will appear in that existing tab.
+
+## Content JSON Entry
+
+```json
+{
+    "name": "Display Name",
+    "model": "bbmodel_filename_without_extension",
+    "material": "texture_name",
+    "scale": 1.0,
+    "tabs": "your_tab_name",
+    "crafting_color": [50.0, 50.0, 50.0],
+    "decoref": "unique_block_id"
+}
+```
+
+### Common Types
+
+| type | behavior |
+|------|----------|
+| (empty/omitted) | Basic decoration block (default) |
+| `"underlayer"` | Wall/floor mounted virtual overlay (paintings, carpets) |
+| `"animated"` | Block with keyframe animations |
+| `"rotatable"` | Block that places at 45 degree increments |
+| `"bed"` | Sleepable bed |
+| `"seat"` | Sittable block |
+| `"chain"` | Chain/rope connector |
+
+### Optional Fields
+
+- `"hidden": true` - registered but not in creative tabs
+- `"transparency": true` - translucent rendering
+- `"passable": true` - no collision
+- `"loot": "other_decoref"` - override what drops when broken
+- `"flipbook": {"frametime": 4, "images": 6}` - animated texture
+- `"script"` - tool_modelswitch, on_use, sounds, particles, etc.
+
+### Model Switching (cycle variants with decobrush)
+
+```json
+"script": {
+    "tool_modelswitch": {
+        "link": "next_variant_id"
+    }
+}
+```
+
+Chain the last variant back to the first to create a cycle.
+
+## Full Documentation
+
+See `json_documentation.md` in the main Decocraft mod for the complete
+field reference with examples of every block type.
+
+## Version Compatibility
+
+Version ranges are open ended, so the pack works with any Decocraft 4.0+
+on Minecraft 26.1+. Bump `decocraft_version` in `gradle.properties` if you
+use features from a newer decocraft release.

gradle.properties

@@ -10,14 +10,14 @@ minecraft_version_range=[26.1,)
 neoforge_loader_range=[4,)
 fabric_loader_version=0.18.2
 
-## Mod Properties
-mod_id=decocraft_pride
-mod_name=Decocraft Pride Addon
+## Mod Properties - CHANGE THESE for your pack
+mod_id=decocraft_mypack
+mod_name=Decocraft My Pack
 mod_license=All Rights Reserved
 mod_version=1.0.0
-mod_group_id=com.razz.decocraft.pride
-mod_authors=Momo, Razz, ProfMobius, Taelnia
-mod_description=Adds pride decorations to Decocraft
+mod_group_id=com.razz.decocraft.mypack
+mod_authors=YourName
+mod_description=Adds new decorations to Decocraft
 
 # Decocraft minimum version
-decocraft_version=3.0.7
+decocraft_version=3.0.7

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

gradlew.bat

@@ -1,94 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -8,4 +8,4 @@ plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
-rootProject.name = 'decocraft-pride'
+rootProject.name = 'decocraft-mypack'

src/main/resources/assets/decocraft/decocraft.json

@@ -1,4 +1,4 @@
 [
   "groups.json",
-  "pride.json"
-]
+  "mypack.json"
+]

src/main/resources/assets/decocraft/groups.json

@@ -1,3 +1,3 @@
 {
-  "pride": { "label": "itemGroup.decocraft.pride", "icon": "wall_flag_1_rainbow_pride" }
-}
+  "mypack": { "label": "itemGroup.decocraft.mypack", "icon": "example_block" }
+}

src/main/resources/assets/decocraft/lang/en_us.json

@@ -0,0 +1,5 @@
+{
+  "itemGroup.decocraft.mypack": "Decocraft - My Pack",
+  "block.decocraft.example_block": "Example Block",
+  "item.decocraft.example_block": "Example Block"
+}

src/main/resources/assets/decocraft/mypack.json

@@ -0,0 +1,13 @@
+{
+  "models": [
+    {
+      "name": "Example Block",
+      "model": "example_block",
+      "material": "example_block",
+      "scale": 1.0,
+      "tabs": "mypack",
+      "crafting_color": [50.0, 50.0, 50.0],
+      "decoref": "example_block"
+    }
+  ]
+}

src/main/resources/assets/decocraft/pride.json

@@ -1,185 +0,0 @@
-{
-  "models": [
-  {
-    "name": "Wall Flag 1 Agender",
-    "decoref": "wall_flag_1_agender",
-    "material": "agender",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Ally",
-    "decoref": "wall_flag_1_ally",
-    "material": "ally",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Aromantic",
-    "decoref": "wall_flag_1_aromantic",
-    "material": "aromantic",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Asexual",
-    "decoref": "wall_flag_1_asexual",
-    "material": "asexual",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Bigender",
-    "decoref": "wall_flag_1_bigender",
-    "material": "bigender",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Bisexual",
-    "decoref": "wall_flag_1_bisexual",
-    "material": "bisexual",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Demiboy",
-    "decoref": "wall_flag_1_demiboy",
-    "material": "demiboy",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Demigirl",
-    "decoref": "wall_flag_1_demigirl",
-    "material": "demigirl",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Demisexual",
-    "decoref": "wall_flag_1_demisexual",
-    "material": "demisexual",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Gay",
-    "decoref": "wall_flag_1_gay",
-    "material": "gay",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Genderfluid",
-    "decoref": "wall_flag_1_genderfluid",
-    "material": "genderfluid",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Intersex",
-    "decoref": "wall_flag_1_intersex",
-    "material": "intersex",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Lesbian",
-    "decoref": "wall_flag_1_lesbian",
-    "material": "lesbian",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Nonbinary",
-    "decoref": "wall_flag_1_nonbinary",
-    "material": "nonbinary",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Pansexual",
-    "decoref": "wall_flag_1_pansexual",
-    "material": "pansexual",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Polysexual",
-    "decoref": "wall_flag_1_polysexual",
-    "material": "polysexual",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Progress Intersex",
-    "decoref": "wall_flag_1_progress_intersex",
-    "material": "progress_intersex",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Progress Pride",
-    "decoref": "wall_flag_1_progress_pride",
-    "material": "progress_pride",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Rainbow Pride",
-    "decoref": "wall_flag_1_rainbow_pride",
-    "material": "rainbow_pride",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  },
-  {
-    "name": "Wall Flag 1 Transgender",
-    "decoref": "wall_flag_1_transgender",
-    "material": "transgender",
-    "model": "wall_flag_1",
-    "scale": 1.0,
-    "tabs": "pride",
-    "crafting_color": [0, 0, 0]
-  }
-  ],
-  "bounding_boxes": []
-}