diff --git a/build.gradle.kts b/build.gradle.kts index 02cd106d7..24553770a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude + val paradiseLostVersion: String by properties val minecraftVersion: String by properties @@ -118,7 +120,7 @@ dependencies { group = "net.kyrptonaught", name = "customportalapi", version = customportalapiVersion, - ).also(::include) + ).also(::include).exclude(module = "sodium") modImplementation( group = "net.fabricmc.fabric-api", @@ -138,12 +140,6 @@ dependencies { version = entityAttributesVersion, ).also(::include) - modImplementation( - group = "io.github.ladysnake", - name = "satin", - version = satinVersion, - ).also(::include) - modImplementation( group = "dev.emi", name = "trinkets", diff --git a/gradle.properties b/gradle.properties index 3a9f398dc..68479eaf8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,4 @@ entityAttributesVersion=2.3.0 modmenuVersion=4.0.6 reiVersion=9.1.530 moreTagsVersion=3.0.5 -satinVersion=1.8.0 clothConfigVersion=8.2.88 diff --git a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java index 9805a359b..2a5e61a27 100644 --- a/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java +++ b/src/main/java/net/id/paradiselost/blocks/ParadiseLostBlocks.java @@ -376,8 +376,8 @@ private static Settings cherineTorch() { return copy(TORCH).ticksRandomly().luminance(state -> 15); } - public static final CherineTorchBlock CHERINE_TORCH = addImmediately("cherine_torch", new CherineTorchBlock(cherineTorch()), cutoutRenderLayer); - public static final CherineWallTorchBlock CHERINE_TORCH_WALL = addImmediately("cherine_wall_torch", new CherineWallTorchBlock(cherineTorch().dropsLike(CHERINE_TORCH)), cutoutRenderLayer); + public static final CherineTorchBlock CHERINE_TORCH = add("cherine_torch", new CherineTorchBlock(cherineTorch()), cutoutRenderLayer); + public static final CherineWallTorchBlock CHERINE_TORCH_WALL = add("cherine_wall_torch", new CherineWallTorchBlock(cherineTorch().dropsLike(CHERINE_TORCH)), cutoutRenderLayer); // Usables public static final IncubatorBlock INCUBATOR = add("incubator", new IncubatorBlock(of(Material.WOOD, MapColor.DULL_RED).strength(2.5f).sounds(BlockSoundGroup.WOOD).nonOpaque()), cutoutMippedRenderLayer); diff --git a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_hanger.json b/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_hanger.json deleted file mode 100644 index 6fd5f07d6..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_hanger.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "tip=false": { - "model": "paradise_lost:block/boreal_wisteria_hanger" - }, - "tip=true": { - "model": "paradise_lost:block/boreal_wisteria_hanger_plant" - } - } -} diff --git a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_leaf_pile.json b/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_leaf_pile.json deleted file mode 100644 index 4b8a68f53..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_leaf_pile.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "paradise_lost:block/frost_wisteria_leaf_pile" - } - } -} diff --git a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_leaves.json b/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_leaves.json deleted file mode 100644 index 8d92ca4e2..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "paradise_lost:block/boreal_wisteria_leaves" - } - } -} diff --git a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_sapling.json b/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_sapling.json deleted file mode 100644 index fb097e1aa..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/boreal_wisteria_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "paradise_lost:block/boreal_wisteria_sapling" - } - } -} diff --git a/src/main/resources/assets/paradise_lost/blockstates/potted_boreal_wisteria_sapling.json b/src/main/resources/assets/paradise_lost/blockstates/potted_boreal_wisteria_sapling.json deleted file mode 100644 index 29843589b..000000000 --- a/src/main/resources/assets/paradise_lost/blockstates/potted_boreal_wisteria_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "paradise_lost:block/potted_boreal_wisteria_sapling" - } - } -} diff --git a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_hanger.json b/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_hanger.json deleted file mode 100644 index 500a2c3b2..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_hanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "paradise_lost:block/wisteria_hanger", - "textures": { - "leaves": "paradise_lost:block/boreal_wisteria_leaves" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_hanger_plant.json b/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_hanger_plant.json deleted file mode 100644 index 8c5b19245..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_hanger_plant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "paradise_lost:block/wisteria_hanger", - "textures": { - "leaves": "paradise_lost:block/boreal_wisteria_hanger_tip" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_leaf_pile.json b/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_leaf_pile.json deleted file mode 100644 index 930e41760..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_leaf_pile.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "paradise_lost:block/leaf_pile", - "textures": { - "leaves": "paradise_lost:block/boreal_wisteria_leaves" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_leaves.json b/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_leaves.json deleted file mode 100644 index 085ab559b..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "paradise_lost:block/boreal_wisteria_leaves" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_sapling.json b/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_sapling.json deleted file mode 100644 index b5b78eec4..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/boreal_wisteria_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cross", - "textures": { - "cross": "paradise_lost:block/boreal_wisteria_sapling" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/block/potted_boreal_wisteria_sapling.json b/src/main/resources/assets/paradise_lost/models/block/potted_boreal_wisteria_sapling.json deleted file mode 100644 index 31529edf9..000000000 --- a/src/main/resources/assets/paradise_lost/models/block/potted_boreal_wisteria_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "paradise_lost:block/boreal_wisteria_sapling" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_hanger.json b/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_hanger.json deleted file mode 100644 index 843d93005..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_hanger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "paradise_lost:block/boreal_wisteria_leaves" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_hanger_plant.json b/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_hanger_plant.json deleted file mode 100644 index d09ce643a..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_hanger_plant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "paradise_lost:block/boreal_wisteria_hanger_tip" - } -} diff --git a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_leaf_pile.json b/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_leaf_pile.json deleted file mode 100644 index 37acc9ce7..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_leaf_pile.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "paradise_lost:block/boreal_wisteria_leaf_pile" -} diff --git a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_leaves.json b/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_leaves.json deleted file mode 100644 index 93cb04f04..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "paradise_lost:block/boreal_wisteria_leaves" -} diff --git a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_sapling.json b/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_sapling.json deleted file mode 100644 index c34ea5e49..000000000 --- a/src/main/resources/assets/paradise_lost/models/item/boreal_wisteria_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "paradise_lost:block/boreal_wisteria_sapling" - } -} diff --git a/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_hanger_tip.png b/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_hanger_tip.png deleted file mode 100644 index 77af28fd3..000000000 Binary files a/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_hanger_tip.png and /dev/null differ diff --git a/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_leaves.png b/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_leaves.png deleted file mode 100644 index 00823bd21..000000000 Binary files a/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_leaves.png and /dev/null differ diff --git a/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_sapling.png b/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_sapling.png deleted file mode 100644 index effef9341..000000000 Binary files a/src/main/resources/assets/paradise_lost/textures/block/boreal_wisteria_sapling.png and /dev/null differ diff --git a/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_hanger.json b/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_hanger.json deleted file mode 100644 index 107a0d7fa..000000000 --- a/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_hanger.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:boreal_wisteria_hanger" - } - ], - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - } - ] - } - ] -} diff --git a/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_leaves.json b/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_leaves.json deleted file mode 100644 index 70fdacc83..000000000 --- a/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_leaves.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "paradise_lost:boreal_wisteria_leaves" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, - 0.0625, - 0.083333336, - 0.1 - ] - } - ], - "name": "paradise_lost:boreal_wisteria_sapling" - } - ] - } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "minecraft:uniform", - "min": 1.0, - "max": 2.0 - }, - "add": false - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} diff --git a/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_sapling.json deleted file mode 100644 index a78594ef1..000000000 --- a/src/main/resources/data/paradise_lost/loot_tables/blocks/boreal_wisteria_sapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:boreal_wisteria_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/paradise_lost/loot_tables/blocks/potted_boreal_wisteria_sapling.json b/src/main/resources/data/paradise_lost/loot_tables/blocks/potted_boreal_wisteria_sapling.json deleted file mode 100644 index c927cd7b0..000000000 --- a/src/main/resources/data/paradise_lost/loot_tables/blocks/potted_boreal_wisteria_sapling.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - }, - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "paradise_lost:boreal_wisteria_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 747d79ed9..b7f28dc23 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -33,7 +33,6 @@ "fabric-api-base": "*", "fabric-registry-sync-v0": "*", "trinkets": "*", - "satin": "*", "cloth-config": "*" }, "mixins": [