diff --git a/.github/assets/allchairs.gif b/.github/assets/allchairs.gif new file mode 100644 index 00000000..ed965337 Binary files /dev/null and b/.github/assets/allchairs.gif differ diff --git a/.github/assets/armrests_kelp.gif b/.github/assets/armrests_kelp.gif new file mode 100644 index 00000000..351d192d Binary files /dev/null and b/.github/assets/armrests_kelp.gif differ diff --git a/.github/assets/armrests_red.gif b/.github/assets/armrests_red.gif new file mode 100644 index 00000000..36c1ca19 Binary files /dev/null and b/.github/assets/armrests_red.gif differ diff --git a/.github/assets/floor_chair.png b/.github/assets/floor_chair.png new file mode 100644 index 00000000..d53bc6d4 Binary files /dev/null and b/.github/assets/floor_chair.png differ diff --git a/.github/assets/kelp_seat.png b/.github/assets/kelp_seat.png new file mode 100644 index 00000000..8d26ec08 Binary files /dev/null and b/.github/assets/kelp_seat.png differ diff --git a/.github/assets/seatwood_planks.png b/.github/assets/seatwood_planks.png new file mode 100644 index 00000000..1cb1989b Binary files /dev/null and b/.github/assets/seatwood_planks.png differ diff --git a/.github/assets/showcase.png b/.github/assets/showcase.png new file mode 100644 index 00000000..494d7e2f Binary files /dev/null and b/.github/assets/showcase.png differ diff --git a/.github/assets/tray_table_showcase.png b/.github/assets/tray_table_showcase.png new file mode 100644 index 00000000..dc3f2ae7 Binary files /dev/null and b/.github/assets/tray_table_showcase.png differ diff --git a/.github/assets/wall_attached_table.png b/.github/assets/wall_attached_table.png new file mode 100644 index 00000000..a7cdb863 Binary files /dev/null and b/.github/assets/wall_attached_table.png differ diff --git a/.gitignore b/.gitignore index 1907012b..2a048464 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ +!.idea/icon.png build/ .gradle/ run/ diff --git a/.idea/icon.png b/.idea/icon.png index 5269f11f..187371ca 100644 Binary files a/.idea/icon.png and b/.idea/icon.png differ diff --git a/README.md b/README.md index e79307b1..c878789f 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ -

Create: Interiors Logo

-

Create: Interiors +

Create: Interiors Logo +

Create: Interiors

available for 1.20-1.20.2 - modloaders forge/neoforged + Supported Modloaders are forge/neoforged/fabric/quilt license - GPL-3.0
curseforge modrinth -
+

Create: Interiors is an addon for Create that extends Create's furnishing options.

- +showcase

Current list of features:

 @@ -29,14 +29,14 @@
  • Can be sat on, both as a part of contraptions and standalone
  • Can pick up entities just like Seat blocks
    • - -

    + gif of all chairs + gif of chair armrest states

    -
  • Low Chair Blocks +
  • Floor Chair Blocks
  • Kelp Seat @@ -45,41 +45,41 @@
  • Can be crafted from 1 Dried Kelp item and 1 Wooden Slab
  • Work exactly like Create's seat blocks

    • - ⠀⠀⠀⠀

    -
  • Kelp Chair + ⠀⠀⠀⠀kelp seat

    +
  • Kelp Chair/Floor Chair
    - ⠀⠀⠀

    + ⠀⠀⠀gif of kelp chair armrest states

    • -
  • Kelp Low Chair
    • -
  • Seatwood Planks
    - ⠀⠀⠀⠀⠀ -
    + ⠀⠀⠀⠀seatwood planks projection + seatwood tray tables
    ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀Seatwood Tray Tables
  • Wall-Attached Table
    - ⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀wall-attached table projection⠀
    • - +
    --- # Contributions -### Massive thanks to [rdh](https://github.com/rhysdh540) for all his critical contributions to Create: Interiors. +### Massive thanks to [rdh](https://github.com/rhysdh540) for all his critical contributions! + +### Thanks to [Luna](https://github.com/LopyLuna) for the wonderful logo :) ## Translating 🥳 @@ -97,10 +97,10 @@ Bug reports, suggestions and ideas are incredibly useful and much appreciated. A
    - +

    Find Create: Interiors on  Modrinth or  CurseForge

    - + Report Issues here

    This project is licensed under GPL-3.0 diff --git a/build.gradle.kts b/build.gradle.kts index 634053c7..6deeee81 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,8 +51,9 @@ allprojects { java { withSourcesJar() - targetCompatibility = JavaVersion.VERSION_17 - sourceCompatibility = JavaVersion.VERSION_17 + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } } diff --git a/common/src/main/resources/assets/interiors/icon.png b/common/src/main/resources/assets/interiors/icon.png new file mode 100644 index 00000000..187371ca Binary files /dev/null and b/common/src/main/resources/assets/interiors/icon.png differ diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5cccb2ce..418520ca 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -11,7 +11,7 @@ "issues": "https://github.com/sudocooperativesystems/CreateInteriorsMod/issues" }, "license": "GPL-3.0", - "icon": "icon.png", + "icon": "assets/interiors/icon.png", "environment": "*", "entrypoints": { "main": [ "com.sudolev.interiors.fabric.CreateInteriorsFabric" ], diff --git a/fabric/src/main/resources/icon.png b/fabric/src/main/resources/icon.png deleted file mode 100644 index 5269f11f..00000000 Binary files a/fabric/src/main/resources/icon.png and /dev/null differ diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 1905bd08..3cef9ff1 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,7 +1,7 @@ modLoader = "javafml" loaderVersion = "[${forge_version},)" license = "GPL-3.0" -issueTrackerURL = "https://github.com/sudolev/CreateInteriorsMod/issues" +issueTrackerURL = "https://github.com/aesefficio/CreateInteriorsMod/issues" [[mods]] modId = "interiors" @@ -9,9 +9,9 @@ version = "${version}" displayName = "Create: Interiors" # https://docs.neoforged.net/docs/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" -displayURL = "https://sudolev.github.io/CreateInteriorsMod/" -issueTrackerURL = "https://github.com/sudolev/CreateInteriorsMod/issues" -logoFile="icon.png" +displayURL = "https://www.curseforge.com/minecraft/mc-mods/interiors" +issueTrackerURL = "https://github.com/aesefficio/CreateInteriorsMod/issues" +logoFile="assets/interiors/icon.png" credits = "rdh" authors = "sudolev" description = ''' diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png deleted file mode 100644 index 5269f11f..00000000 Binary files a/forge/src/main/resources/icon.png and /dev/null differ diff --git a/forge/src/main/resources/mod_banner.png b/forge/src/main/resources/mod_banner.png index 96fa196e..881374f3 100644 Binary files a/forge/src/main/resources/mod_banner.png and b/forge/src/main/resources/mod_banner.png differ