Skip to content

Commit

Permalink
Updated to 1.21.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Suel-ki committed Dec 7, 2024
1 parent 150ee7e commit 941b431
Show file tree
Hide file tree
Showing 61 changed files with 352 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.7.+'
id 'fabric-loom' version '1.9.+'
id 'maven-publish'
}

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.21.3
yarn_mappings=1.21.3+build.2
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.1
loader_version=0.16.9

# Mod Properties
mod_version=1.4.1+1.21.3
mod_version=1.5.0+1.21.4
maven_group=io.github.suel_ki.beautify
archives_base_name=beautify

# Dependencies
fabric_version=0.110.0+1.21.3
cloth_config_version=16.0.141
jade_id=5846071
modmenu_version=12.0.0-beta.1
fabric_version=0.111.0+1.21.4
cloth_config_version=17.0.142
jade_id=5967298
modmenu_version=13.0.0-beta.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ public InteractionResult useItemOn(ItemStack stack, BlockState state, Level leve
}

@Override
public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state) {
return this.isEmpty(state) ? super.getCloneItemStack(level, pos, state) : new ItemStack(getContent(state));
public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state, boolean bl) {
return this.isEmpty(state) ? super.getCloneItemStack(level, pos, state, bl) : new ItemStack(getContent(state));
}

private boolean isEmpty(BlockState state) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ public InteractionResult useItemOn(ItemStack stack, BlockState state, Level leve
}

@Override
public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state) {
return this.isEmpty(state) ? super.getCloneItemStack(level, pos, state) : new ItemStack(getContent(state));
public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state, boolean bl) {
return this.isEmpty(state) ? super.getCloneItemStack(level, pos, state, bl) : new ItemStack(getContent(state));
}

private boolean isEmpty(BlockState state) {
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/assets/beautify/items/acacia_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/acacia_blinds"
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/acacia_picture_frame"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/acacia_trellis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/acacia_trellis"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/birch_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/birch_blinds"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/birch_picture_frame"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/birch_trellis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/birch_trellis"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/bookstack.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/bookstack"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/botanist_workbench"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/cherry_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/cherry_blinds"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/cherry_picture_frame"
}
}
7 changes: 7 additions & 0 deletions src/main/resources/assets/beautify/items/cherry_trellis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

{
"model": {
"type": "minecraft:model",
"model": "beautify:item/cherry_trellis"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/crimson_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/crimson_blinds"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/crimson_picture_frame"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/crimson_trellis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/crimson_trellis"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/dark_oak_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/dark_oak_blinds"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/dark_oak_picture_frame"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/dark_oak_trellis"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/hanging_pot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/hanging_pot"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/iron_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/iron_blinds"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/jungle_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/jungle_blinds"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/jungle_picture_frame"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/jungle_trellis.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/jungle_trellis"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/lamp_bamboo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_bamboo"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/lamp_candelabra.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_black"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_blue"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_brown"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_cyan"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_gray"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_green"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_light_blue"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_light_gray"
},
"parent": "beautify:block/lamps/candelabras/standing_lamp_candelabra_off_light_gray"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_lime"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_magenta"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_orange"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_pink"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_purple"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_red"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_white"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_candelabra_yellow"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/lamp_jar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_jar"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/lamp_light_bulb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/lamp_light_bulb"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/beautify/items/mangrove_blinds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "beautify:item/mangrove_blinds"
}
}
Loading

0 comments on commit 941b431

Please sign in to comment.