Skip to content

Commit

Permalink
Rewrote the mod
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexNijjar committed Oct 15, 2023
1 parent c27b996 commit 563b0c1
Show file tree
Hide file tree
Showing 15,851 changed files with 449,933 additions and 33,258 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 0 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ jobs:
game-versions: ${{ steps.properties.outputs.minecraftVersion }}
version-resolver: exact

dependencies: |
resourceful-lib | depends | *
- name: Upload Fabric Releases (Curse/Modrinth/Github)
if: contains(steps.properties.outputs.enabledPlatforms, 'fabric')
uses: Kir-Antipov/[email protected]
Expand All @@ -78,10 +75,6 @@ jobs:
game-versions: ${{ steps.properties.outputs.minecraftVersion }}
version-resolver: exact

dependencies: |
fabric-api | depends | *
resourceful-lib | depends | *
- name: Generate Discord Embed
run: ./gradlew injectEmbed

Expand Down
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ hs_err_pid*
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

Expand Down Expand Up @@ -115,4 +112,7 @@ gradle-app.setting
run/

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
!gradle-wrapper.jar

# Architectury Garbage
*.architectury-transformer
30 changes: 0 additions & 30 deletions LICENSE

This file was deleted.

91 changes: 1 addition & 90 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,90 +1 @@
<center>

![Handcrafted](https://cdn.discordapp.com/attachments/721407493351407646/1053489346797379634/handcrafted_page_top.png)

[![Requires Resourceful Lib](https://cdn.discordapp.com/attachments/1073717602880327761/1073717942014972034/RLib_vector.svg)](http://modrinth.com/mod/resourceful-lib)

[![Made by Terrarium](https://cdn.discordapp.com/attachments/1073717602880327761/1073718144910233691/Terrarium_vector.svg)](https://discord.terrarium.earth)
[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/mod/handcrafted)
[![CurseForge](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/curseforge_vector.svg)](https://www.curseforge.com/minecraft/mc-mods/handcrafted)
<hr>

### 📖About 📖

<hr>
</center>

From the creators of Chipped, we now present Handcrafted! A mod to make your house into your
home! :D

Are you looking for a fantasy, steampunk or medieval feel? Or do you want to stick to a more vanilla decor? Look no
further! We've created over 250 furniture pieces for you to choose from. Be it chairs, tables, benches or desks;
we got it all packaged neatly into a single mod. This mod will provide all the furniture you could ever need to make
your blocky house a home!

![Credits](https://cdn.discordapp.com/attachments/721407493351407646/1053489347111956601/handcrafted_page_credits.png)
#### Programmers:
Alex Nijjar, CodexAdrian, MsRandom, ThatGravyBoat
#### Artists:
Kekie6, Facu, Marc-IceBlade

<center>

## ✨Socials✨

[![YouTube](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/social/youtube-plural_vector.svg)](https://youtube.terrarium.earth)
[![Twitch](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/social/twitch-plural_vector.svg)](https://www.twitch.tv/terrariumearth)
[![Twitter](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/social/twitter-plural_vector.svg)](https://twitter.terrarium.earth)
[![Kofi](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/donate/kofi-plural_vector.svg)](https://kofi.terrarium.earth)
[![Discord-plural](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/social/discord-plural_vector.svg)](https://discord.terrarium.earth)
[![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/available/modrinth_vector.svg)](https://modrinth.com/user/Terrarium)
[![CurseForge](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy-minimal/available/curseforge_vector.svg)](https://www.curseforge.com/members/terrariumearth/projects)
<hr>
</center>

## Developers

To add this library to your project, do the following:

```groovy
repositories {
maven {
// Location of the maven that hosts Terrarium and Team Resourceful's files.
name = "Team Resourceful Maven"
url = "https://maven.resourcefulbees.com/repository/maven-public/"
}
}
```

In an Architectury project, you would implement it like so:

Common

```groovy
dependencies {
modImplementation "earth.terrarium:handcrafted-common-$rootProject.minecraft_version:$rootProject.handcrafted_version"
}
```

Fabric

```groovy
dependencies {
modImplementation "earth.terrarium:handcrafted-fabric-$rootProject.minecraft_version:$rootProject.handcrafted_version"
}
```

Forge

```groovy
dependencies {
modImplementation "earth.terrarium:handcrafted-forge-$rootProject.minecraft_version:$rootProject.handcrafted_version"
}
```

---

<div align="center">

![Version](https://img.shields.io/maven-metadata/v?label=Handcrafted%20Version&metadataUrl=https%3A%2F%2Fnexus.resourcefulbees.com%2Frepository%2Fmaven-public%2Fearth%2Fterrarium%2Fhandcrafted-common-1.19.4%2Fmaven-metadata.xml)
</div>
# Handcrafted
28 changes: 19 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ subprojects {
apply(plugin = "maven-publish")
apply(plugin = "dev.architectury.loom")
apply(plugin = "architectury-plugin")
apply(plugin = "com.github.johnrengelman.shadow")

val minecraftVersion: String by project
val modLoader = project.name
Expand Down Expand Up @@ -58,7 +57,7 @@ subprojects {
})

compileOnly(group = "com.teamresourceful", name = "yabn", version = "1.0.3")
"modApi"(group = "com.teamresourceful.resourcefullib", name = "resourcefullib-$modLoader-$minecraftVersion", version = resourcefulLibVersion)
"include"("modApi"(group = "com.teamresourceful.resourcefullib", name = "resourcefullib-$modLoader-$minecraftVersion", version = resourcefulLibVersion))
}

java {
Expand All @@ -73,7 +72,15 @@ subprojects {
archiveClassifier.set(null as String?)
}

tasks.processResources {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
filesMatching(listOf("META-INF/mods.toml", "fabric.mod.json")) {
expand("version" to project.version)
}
}

if (!isCommon) {
apply(plugin = "com.github.johnrengelman.shadow")
configure<ArchitectPluginExtension> {
platformSetupLoomIde()
}
Expand All @@ -87,6 +94,9 @@ subprojects {
"shadowJar"(ShadowJar::class) {
archiveClassifier.set("dev-shadow")
configurations = listOf(shadowCommon)

exclude(".cache/**") // Remove datagen cache from jar.
exclude("**/handcrafted/datagen/**") // Remove data gen code from jar.
}

"remapJar"(RemapJarTask::class) {
Expand All @@ -106,25 +116,25 @@ subprojects {

pom {
name.set("Handcrafted $modLoader")
url.set("https://github.com/terrarium-earth/$modId")
url.set("https://github.com/bonsaistudi0s/$modId")

scm {
connection.set("git:https://github.com/terrarium-earth/$modId.git")
developerConnection.set("git:https://github.com/terrarium-earth/$modId.git")
url.set("https://github.com/terrarium-earth/$modId")
connection.set("git:https://github.com/bonsaistudi0s/$modId.git")
developerConnection.set("git:https://github.com/bonsaistudi0s/$modId.git")
url.set("https://github.com/bonsaistudi0s/$modId")
}

licenses {
license {
name.set("MIT")
name.set("ARR")
}
}
}
}
}
repositories {
maven {
setUrl("https://maven.resourcefulbees.com/repository/terrarium/")
setUrl("https://maven.resourcefulbees.com/repository/bonsaistudi0s/")
credentials {
username = System.getenv("MAVEN_USER")
password = System.getenv("MAVEN_PASS")
Expand All @@ -149,4 +159,4 @@ resourcefulGradle {
))
}
}
}
}
36 changes: 35 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
- Fix create integration
## Warning

**This update introduces multiple breaking changes. Please back up you world
before updating.**

- Shelves, counters, drawers, and cupboards have had a change in their id.
Because of this, they will be deleted from the world and must be placed again.
Make sure to remove inventory contents before updating.
- Some furniture may lose some of their blockstates, thus
may look weird and should be broken and placed again.
- Furniture will lose any sheets/pillows attached to them.


- Substantial performance improvements to all blocks.
Furniture should now be as performant as normal blocks.
- Removed boards. The reason they existed in the first place was to prevent recipe conflicts. If you're a pack dev, you
may need to check for recipe conflicts now.
- Redid all the recipes.
- All furniture is now done via blockstates and block models. this allows
them to be changed via resource packs.
- Pillar trims now attack to block faces, allowing for both horizontal and vertical trims.
- Trims now have proper voxel shapes.
- Add more trim types.
- Add better tooltips to make it more clear what's hammerable, what can hold cushions, and what can hold sheets.
- Shelf variants are now controlled via hammer.
- Fancy beds should no longer break with block entity optimization mods. I haven't tested, but it'll probably work now.
- Optimized fancy beds. Fancy beds are no longer block entities which improves their performance substantially,
far beyond even vanilla beds.
- Add highlight support to furniture. This improves the visual outline box of the furniture.
- Add hammer sounds.
- Fix crockery combos not dropping the item on the plate.
- Counters now have inventories.
- Fix cats not sleeping on fancy beds.
- Fix villagers not sleeping on fancy beds. Fancy beds are now a villager POI. (Fabric only currently)
- Fix mobs not pathfinding through furniture properly.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.20.1 2023-10-07T00:09:10.811082 Tags for minecraft:painting_variant mod id handcrafted
b3492d6a0655791539fc1fe06182c10d06b88fd8 data/handcrafted/tags/painting_variant/paintings.json
Loading

0 comments on commit 563b0c1

Please sign in to comment.