acethewildfire/acesbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Update to 1.21.3

Browse Source
This commit is contained in:
Vos
2026-03-15 17:10:24 -05:00
parent 582a614042
commit 43f9f7760d
202 changed files with 1413 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+3 -4
View File
@@ -35,10 +35,9 @@ dependencies {
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:16.0.777"
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:16.0.777"
modApi "dev.architectury:architectury-fabric:13.0.8"
modApi "me.shedaniel.cloth:cloth-config-fabric:15.0.140"
modApi "me.shedaniel:RoughlyEnoughItems-fabric:17.0.807"
modApi "dev.architectury:architectury-fabric:14.0.4"
modApi "me.shedaniel.cloth:cloth-config-fabric:16.0.143"
}
processResources {
gradle.properties
+3 -3
View File
@@ -4,13 +4,13 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.21.1
yarn_mappings=1.21.1+build.3
minecraft_version=1.21.3
yarn_mappings=1.21.3+build.2
loader_version=0.18.4
loom_version=1.15-SNAPSHOT
# Fabric API
fabric_version=0.116.8+1.21.1
fabric_version=0.114.1+1.21.3
# Mod Properties
mod_version=2.0.0
src/main/generated/data/acesbs/advancement/recipes/building_blocks/infernal_ashes.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:infernal_ashes"
"recipe": "minecraft:infernal_ashes"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:infernal_ashes"
"minecraft:infernal_ashes"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/building_blocks/prisma_steel.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:prisma_steel"
"recipe": "minecraft:prisma_steel"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:prisma_steel"
"minecraft:prisma_steel"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/building_blocks/raw_endtropy.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:raw_endtropy"
"recipe": "minecraft:raw_endtropy"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:raw_endtropy"
"minecraft:raw_endtropy"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/building_blocks/raw_entropy.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:raw_entropy"
"recipe": "minecraft:raw_entropy"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:raw_entropy"
"minecraft:raw_entropy"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/building_blocks/stable_endtropy.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:stable_endtropy"
"recipe": "minecraft:stable_endtropy"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:stable_endtropy"
"minecraft:stable_endtropy"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/building_blocks/stable_entropy.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:stable_entropy"
"recipe": "minecraft:stable_entropy"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:stable_entropy"
"minecraft:stable_entropy"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/decorations/infernal_ashes_block.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:infernal_ashes_block"
"recipe": "minecraft:infernal_ashes_block"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:infernal_ashes_block"
"minecraft:infernal_ashes_block"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/decorations/prisma_steel_block.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:prisma_steel_block"
"recipe": "minecraft:prisma_steel_block"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:prisma_steel_block"
"minecraft:prisma_steel_block"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/decorations/raw_endtropy_block.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:raw_endtropy_block"
"recipe": "minecraft:raw_endtropy_block"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:raw_endtropy_block"
"minecraft:raw_endtropy_block"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/decorations/raw_entropy_block.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:raw_entropy_block"
"recipe": "minecraft:raw_entropy_block"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:raw_entropy_block"
"minecraft:raw_entropy_block"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/decorations/stable_endtropy_block.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:stable_endtropy_block"
"recipe": "minecraft:stable_endtropy_block"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:stable_endtropy_block"
"minecraft:stable_endtropy_block"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/decorations/stable_entropy_block.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:stable_entropy_block"
"recipe": "minecraft:stable_entropy_block"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:stable_entropy_block"
"minecraft:stable_entropy_block"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/food/cooked_lemon_from_campfire_cooking.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:cooked_lemon_from_campfire_cooking"
"recipe": "minecraft:cooked_lemon_from_campfire_cooking"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:cooked_lemon_from_campfire_cooking"
"minecraft:cooked_lemon_from_campfire_cooking"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/food/cooked_lemon_from_smelting.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:cooked_lemon_from_smelting"
"recipe": "minecraft:cooked_lemon_from_smelting"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:cooked_lemon_from_smelting"
"minecraft:cooked_lemon_from_smelting"
]
}
}
src/main/generated/data/acesbs/advancement/recipes/food/cooked_lemon_from_smoking.json
+2 -2
View File
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "acesbs:cooked_lemon_from_smoking"
"recipe": "minecraft:cooked_lemon_from_smoking"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"acesbs:cooked_lemon_from_smoking"
"minecraft:cooked_lemon_from_smoking"
]
}
}
src/main/generated/data/acesbs/loot_table/blocks/deepslate_entropy_ore.json
+5 -22
View File
@@ -36,6 +36,10 @@
{
"bonus_rolls": 0.0,
"conditions": [
{
"chance": 0.1,
"condition": "minecraft:random_chance"
},
{
"condition": "minecraft:inverted",
"term": {
@@ -65,11 +69,6 @@
}
],
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air",
"weight": 360
},
{
"type": "minecraft:item",
"name": "minecraft:coal",
@@ -123,11 +122,7 @@
"function": "minecraft:explosion_decay"
}
],
"rolls": {
"type": "minecraft:uniform",
"max": 3.0,
"min": 1.0
}
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
@@ -149,18 +144,6 @@
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"acesbs:prisma_steel_pickaxe",
"acesbs:prisma_steel_hammer"
]
}
}
}
],
"entries": [
src/main/generated/data/acesbs/loot_table/blocks/endtropy_ore.json
+5 -22
View File
@@ -36,6 +36,10 @@
{
"bonus_rolls": 0.0,
"conditions": [
{
"chance": 0.1,
"condition": "minecraft:random_chance"
},
{
"condition": "minecraft:inverted",
"term": {
@@ -65,11 +69,6 @@
}
],
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air",
"weight": 360
},
{
"type": "minecraft:item",
"name": "minecraft:coal",
@@ -123,11 +122,7 @@
"function": "minecraft:explosion_decay"
}
],
"rolls": {
"type": "minecraft:uniform",
"max": 3.0,
"min": 1.0
}
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
@@ -149,18 +144,6 @@
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"acesbs:prisma_steel_pickaxe",
"acesbs:prisma_steel_hammer"
]
}
}
}
],
"entries": [
src/main/generated/data/acesbs/loot_table/blocks/entropy_ore.json
+5 -22
View File
@@ -36,6 +36,10 @@
{
"bonus_rolls": 0.0,
"conditions": [
{
"chance": 0.1,
"condition": "minecraft:random_chance"
},
{
"condition": "minecraft:inverted",
"term": {
@@ -65,11 +69,6 @@
}
],
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air",
"weight": 360
},
{
"type": "minecraft:item",
"name": "minecraft:coal",
@@ -123,11 +122,7 @@
"function": "minecraft:explosion_decay"
}
],
"rolls": {
"type": "minecraft:uniform",
"max": 3.0,
"min": 1.0
}
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
@@ -149,18 +144,6 @@
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"acesbs:prisma_steel_pickaxe",
"acesbs:prisma_steel_hammer"
]
}
}
}
],
"entries": [
src/main/generated/data/acesbs/loot_table/blocks/infernal_ashes_ore.json
+5 -22
View File
@@ -36,6 +36,10 @@
{
"bonus_rolls": 0.0,
"conditions": [
{
"chance": 0.1,
"condition": "minecraft:random_chance"
},
{
"condition": "minecraft:inverted",
"term": {
@@ -65,11 +69,6 @@
}
],
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:air",
"weight": 360
},
{
"type": "minecraft:item",
"name": "minecraft:coal",
@@ -123,11 +122,7 @@
"function": "minecraft:explosion_decay"
}
],
"rolls": {
"type": "minecraft:uniform",
"max": 3.0,
"min": 1.0
}
"rolls": 1.0
},
{
"bonus_rolls": 0.0,
@@ -149,18 +144,6 @@
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:match_tool",
"predicate": {
"items": [
"acesbs:prisma_steel_pickaxe",
"acesbs:prisma_steel_hammer"
]
}
}
}
],
"entries": [
src/main/generated/data/acesbs/recipe/ashen.json
+3 -9
View File
@@ -1,12 +1,6 @@
{
"type": "minecraft:smithing_trim",
"addition": {
"tag": "minecraft:trim_materials"
},
"base": {
"tag": "minecraft:trimmable_armor"
},
"template": {
"item": "acesbs:ashen_armor_trim_smithing_template"
}
"addition": "#minecraft:trim_materials",
"base": "#minecraft:trimmable_armor",
"template": "acesbs:ashen_armor_trim_smithing_template"
}
src/main/generated/data/acesbs/recipe/ashen_steel_boots.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
}
"#": "acesbs:ashen_steel"
},
"pattern": [
" ",
src/main/generated/data/acesbs/recipe/ashen_steel_chestplate.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
}
"#": "acesbs:ashen_steel"
},
"pattern": [
"# #",
src/main/generated/data/acesbs/recipe/ashen_steel_hammer.json
+3 -9
View File
@@ -2,15 +2,9 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"B": {
"item": "acesbs:ashen_steel_block"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"B": "acesbs:ashen_steel_block",
"I": "minecraft:stick"
},
"pattern": [
"B#B",
src/main/generated/data/acesbs/recipe/ashen_steel_helmet.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
}
"#": "acesbs:ashen_steel"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/ashen_steel_leggings.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
}
"#": "acesbs:ashen_steel"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/ashen_steel_pickaxe.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/ashen_steel_shovel.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
" # ",
src/main/generated/data/acesbs/recipe/ashen_steel_sword.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
" # ",
src/main/generated/data/acesbs/recipe/bricked_up.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "minecraft:brick"
},
{
"item": "acesbs:stable_endtropy"
}
"minecraft:brick",
"acesbs:stable_endtropy"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/bubble_pipe.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:iron_ingot"
},
"P": {
"item": "minecraft:birch_planks"
}
"#": "minecraft:iron_ingot",
"P": "minecraft:birch_planks"
},
"pattern": [
" #",
src/main/generated/data/acesbs/recipe/cigarette.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "minecraft:paper"
},
{
"item": "acesbs:tobacco"
}
"minecraft:paper",
"acesbs:tobacco"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/cigarette_funny.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "acesbs:cigarette"
},
{
"item": "acesbs:infernal_ashes"
}
"acesbs:cigarette",
"acesbs:infernal_ashes"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/cigarette_lemon.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "acesbs:cigarette"
},
{
"item": "acesbs:combustible_lemon"
}
"acesbs:cigarette",
"acesbs:combustible_lemon"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/combustible_lemon.json
+3 -9
View File
@@ -2,15 +2,9 @@
"type": "minecraft:crafting_shapeless",
"category": "equipment",
"ingredients": [
{
"item": "acesbs:lemon"
},
{
"item": "minecraft:fire_charge"
},
{
"item": "minecraft:gunpowder"
}
"acesbs:lemon",
"minecraft:fire_charge",
"minecraft:gunpowder"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/cooked_lemon_from_campfire_cooking.json
+1 -3
View File
@@ -3,9 +3,7 @@
"category": "food",
"cookingtime": 600,
"experience": 0.35,
"ingredient": {
"item": "acesbs:lemon"
},
"ingredient": "acesbs:lemon",
"result": {
"id": "acesbs:cooked_lemon"
}
src/main/generated/data/acesbs/recipe/cooked_lemon_from_smelting.json
+1 -3
View File
@@ -3,9 +3,7 @@
"category": "food",
"cookingtime": 200,
"experience": 0.35,
"ingredient": {
"item": "acesbs:lemon"
},
"ingredient": "acesbs:lemon",
"result": {
"id": "acesbs:cooked_lemon"
}
src/main/generated/data/acesbs/recipe/cooked_lemon_from_smoking.json
+1 -3
View File
@@ -3,9 +3,7 @@
"category": "food",
"cookingtime": 100,
"experience": 0.35,
"ingredient": {
"item": "acesbs:lemon"
},
"ingredient": "acesbs:lemon",
"result": {
"id": "acesbs:cooked_lemon"
}
src/main/generated/data/acesbs/recipe/crystal_entropy_from_stable_and_glass.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:glass"
},
"S": {
"item": "acesbs:stable_entropy"
}
"#": "minecraft:glass",
"S": "acesbs:stable_entropy"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/crystal_entropy_pane.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:crystal_entropy"
}
"#": "acesbs:crystal_entropy"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/entropic_entangler.json
+4 -12
View File
@@ -2,18 +2,10 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"B": {
"item": "minecraft:bucket"
},
"G": {
"item": "minecraft:gold_block"
},
"I": {
"item": "minecraft:iron_ingot"
},
"S": {
"item": "acesbs:stable_entropy"
}
"B": "minecraft:bucket",
"G": "minecraft:gold_block",
"I": "minecraft:iron_ingot",
"S": "acesbs:stable_entropy"
},
"pattern": [
"ISI",
src/main/generated/data/acesbs/recipe/entropic_eviscerator.json
+3 -9
View File
@@ -2,15 +2,9 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"E": {
"item": "acesbs:stable_entropy"
},
"I": {
"item": "minecraft:iron_ingot"
},
"S": {
"item": "minecraft:stonecutter"
}
"E": "acesbs:stable_entropy",
"I": "minecraft:iron_ingot",
"S": "minecraft:stonecutter"
},
"pattern": [
"III",
src/main/generated/data/acesbs/recipe/entropic_stabilizer.json
+3 -9
View File
@@ -2,15 +2,9 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"B": {
"item": "minecraft:blue_ice"
},
"I": {
"item": "minecraft:iron_ingot"
},
"R": {
"item": "acesbs:raw_entropy"
}
"B": "minecraft:blue_ice",
"I": "minecraft:iron_ingot",
"R": "acesbs:raw_entropy"
},
"pattern": [
"IRI",
src/main/generated/data/acesbs/recipe/infernal_ashes.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:infernal_ashes_block"
}
"acesbs:infernal_ashes_block"
],
"result": {
"count": 9,
src/main/generated/data/acesbs/recipe/infernal_ashes_block.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:infernal_ashes"
}
"#": "acesbs:infernal_ashes"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.left.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
"## ",
src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.right.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
" ##",
src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.left.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
"## ",
src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.right.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:ashen_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:ashen_steel",
"I": "minecraft:stick"
},
"pattern": [
" ##",
src/main/generated/data/acesbs/recipe/item.acesbs.prisma_steel_axe.left.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
"## ",
src/main/generated/data/acesbs/recipe/item.acesbs.prisma_steel_axe.right.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
" ##",
src/main/generated/data/acesbs/recipe/item.acesbs.prisma_steel_hoe.left.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
"## ",
src/main/generated/data/acesbs/recipe/item.acesbs.prisma_steel_hoe.right.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
" ##",
src/main/generated/data/acesbs/recipe/lemonwood_button.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "redstone",
"ingredients": [
{
"item": "acesbs:lemonwood_planks"
}
"acesbs:lemonwood_planks"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/lemonwood_door.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "redstone",
"key": {
"#": {
"item": "acesbs:lemonwood_planks"
}
"#": "acesbs:lemonwood_planks"
},
"pattern": [
"##",
src/main/generated/data/acesbs/recipe/lemonwood_fence.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "minecraft:stick"
},
"W": {
"item": "acesbs:lemonwood_planks"
}
"#": "minecraft:stick",
"W": "acesbs:lemonwood_planks"
},
"pattern": [
"W#W",
src/main/generated/data/acesbs/recipe/lemonwood_fence_gate.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "redstone",
"key": {
"#": {
"item": "minecraft:stick"
},
"W": {
"item": "acesbs:lemonwood_planks"
}
"#": "minecraft:stick",
"W": "acesbs:lemonwood_planks"
},
"pattern": [
"#W#",
src/main/generated/data/acesbs/recipe/lemonwood_planks_from_lemonwood_log.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:lemonwood_log"
}
"acesbs:lemonwood_log"
],
"result": {
"count": 4,
src/main/generated/data/acesbs/recipe/lemonwood_planks_from_lemonwood_wood.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:lemonwood_wood"
}
"acesbs:lemonwood_wood"
],
"result": {
"count": 4,
src/main/generated/data/acesbs/recipe/lemonwood_planks_from_stripped_lemonwood_log.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:stripped_lemonwood_log"
}
"acesbs:stripped_lemonwood_log"
],
"result": {
"count": 4,
src/main/generated/data/acesbs/recipe/lemonwood_planks_from_stripped_lemonwood_wood.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:stripped_lemonwood_wood"
}
"acesbs:stripped_lemonwood_wood"
],
"result": {
"count": 4,
src/main/generated/data/acesbs/recipe/lemonwood_pressure_plate.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "redstone",
"key": {
"#": {
"item": "acesbs:lemonwood_planks"
}
"#": "acesbs:lemonwood_planks"
},
"pattern": [
"##"
src/main/generated/data/acesbs/recipe/lemonwood_sapling.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "minecraft:birch_sapling"
},
{
"item": "acesbs:lemon"
}
"minecraft:birch_sapling",
"acesbs:lemon"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/lemonwood_slab.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "acesbs:lemonwood_planks"
}
"#": "acesbs:lemonwood_planks"
},
"pattern": [
"###"
src/main/generated/data/acesbs/recipe/lemonwood_stairs.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "acesbs:lemonwood_planks"
}
"#": "acesbs:lemonwood_planks"
},
"pattern": [
"# ",
src/main/generated/data/acesbs/recipe/lemonwood_trapdoor.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "redstone",
"key": {
"#": {
"item": "acesbs:lemonwood_planks"
}
"#": "acesbs:lemonwood_planks"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/lemonwood_wall.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "acesbs:lemonwood_planks"
}
"#": "acesbs:lemonwood_planks"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/lemonwood_wood.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "acesbs:lemonwood_log"
}
"#": "acesbs:lemonwood_log"
},
"pattern": [
"## ",
src/main/generated/data/acesbs/recipe/lizard_button.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "redstone",
"ingredients": [
{
"item": "acesbs:lizard_planks"
}
"acesbs:lizard_planks"
],
"result": {
"count": 1,
src/main/generated/data/acesbs/recipe/lizard_planks.json
+6 -18
View File
@@ -2,24 +2,12 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "minecraft:birch_planks"
},
{
"item": "minecraft:birch_planks"
},
{
"item": "minecraft:birch_planks"
},
{
"item": "minecraft:birch_planks"
},
{
"item": "acesbs:raw_entropy"
},
{
"item": "minecraft:green_dye"
}
"minecraft:birch_planks",
"minecraft:birch_planks",
"minecraft:birch_planks",
"minecraft:birch_planks",
"acesbs:raw_entropy",
"minecraft:green_dye"
],
"result": {
"count": 4,
src/main/generated/data/acesbs/recipe/oracle_lemon.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:stable_entropy"
},
"L": {
"item": "acesbs:lemon"
}
"#": "acesbs:stable_entropy",
"L": "acesbs:lemon"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/prisma.json
+3 -9
View File
@@ -1,12 +1,6 @@
{
"type": "minecraft:smithing_trim",
"addition": {
"tag": "minecraft:trim_materials"
},
"base": {
"tag": "minecraft:trimmable_armor"
},
"template": {
"item": "acesbs:prisma_armor_trim_smithing_template"
}
"addition": "#minecraft:trim_materials",
"base": "#minecraft:trimmable_armor",
"template": "acesbs:prisma_armor_trim_smithing_template"
}
src/main/generated/data/acesbs/recipe/prisma_steel.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:prisma_steel_block"
}
"acesbs:prisma_steel_block"
],
"result": {
"count": 9,
src/main/generated/data/acesbs/recipe/prisma_steel_block.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:prisma_steel"
}
"#": "acesbs:prisma_steel"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/prisma_steel_boots.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
}
"#": "acesbs:prisma_steel"
},
"pattern": [
" ",
src/main/generated/data/acesbs/recipe/prisma_steel_chestplate.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
}
"#": "acesbs:prisma_steel"
},
"pattern": [
"# #",
src/main/generated/data/acesbs/recipe/prisma_steel_hammer.json
+3 -9
View File
@@ -2,15 +2,9 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"B": {
"item": "acesbs:prisma_steel_block"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"B": "acesbs:prisma_steel_block",
"I": "minecraft:stick"
},
"pattern": [
"B#B",
src/main/generated/data/acesbs/recipe/prisma_steel_helmet.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
}
"#": "acesbs:prisma_steel"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/prisma_steel_leggings.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
}
"#": "acesbs:prisma_steel"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/prisma_steel_pickaxe.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/prisma_steel_shovel.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
" # ",
src/main/generated/data/acesbs/recipe/prisma_steel_sword.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"#": {
"item": "acesbs:prisma_steel"
},
"I": {
"item": "minecraft:stick"
}
"#": "acesbs:prisma_steel",
"I": "minecraft:stick"
},
"pattern": [
" # ",
src/main/generated/data/acesbs/recipe/raw_endtropy.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:raw_endtropy_block"
}
"acesbs:raw_endtropy_block"
],
"result": {
"count": 9,
src/main/generated/data/acesbs/recipe/raw_endtropy_block.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:raw_endtropy"
}
"#": "acesbs:raw_endtropy"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/raw_entropy.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:raw_entropy_block"
}
"acesbs:raw_entropy_block"
],
"result": {
"count": 9,
src/main/generated/data/acesbs/recipe/raw_entropy_block.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:raw_entropy"
}
"#": "acesbs:raw_entropy"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/stable_endtropy.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:stable_endtropy_block"
}
"acesbs:stable_endtropy_block"
],
"result": {
"count": 9,
src/main/generated/data/acesbs/recipe/stable_endtropy_block.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:stable_endtropy"
}
"#": "acesbs:stable_endtropy"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/stable_entropy.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "acesbs:stable_entropy_block"
}
"acesbs:stable_entropy_block"
],
"result": {
"count": 9,
src/main/generated/data/acesbs/recipe/stable_entropy_block.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"#": {
"item": "acesbs:stable_entropy"
}
"#": "acesbs:stable_entropy"
},
"pattern": [
"###",
src/main/generated/data/acesbs/recipe/stripped_lemonwood_wood.json
+1 -3
View File
@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "acesbs:stripped_lemonwood_log"
}
"#": "acesbs:stripped_lemonwood_log"
},
"pattern": [
"## ",
src/main/generated/data/acesbs/recipe/thot_begone.json
+2 -6
View File
@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"P": {
"tag": "minecraft:planks"
},
"S": {
"item": "minecraft:stick"
}
"P": "#minecraft:planks",
"S": "minecraft:stick"
},
"pattern": [
" P",
src/main/generated/data/acesbs/tags/item/berserkers_repair.json
+5
View File
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:leather"
]
}
src/main/generated/data/acesbs/tags/item/plates_repair.json
+5
View File
@@ -0,0 +1,5 @@
{
"values": [
"acesbs:ashen_steel"
]
}
src/main/generated/data/acesbs/tags/item/wildfire_repair.json
+5
View File
@@ -0,0 +1,5 @@
{
"values": [
"acesbs:infernal_ashes"
]
}
src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES
+5
View File
@@ -0,0 +1,5 @@
attribute components on items and armor are not being applied.
- Thot-begone
- Beserkers Pauldon
REI display does not display custom recipes.
src/main/java/com/acethewildfire/acesbs/V1 Complete.txt
View File
src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java
+77 -73
View File
@@ -13,25 +13,26 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemConvertible;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.intprovider.UniformIntProvider;
import java.util.function.Function;
import java.util.function.ToIntFunction;
import static net.minecraft.block.Blocks.createFlowerPotBlock;
public class ModBlocks {
public static final Block RAW_ENTROPY_BLOCK = registerBlock("raw_entropy_block",
new RawEntropyBlock(AbstractBlock.Settings.create()
properties -> new RawEntropyBlock(properties
.strength(3f)
.requiresTool()
.sounds(BlockSoundGroup.AMETHYST_BLOCK)));
public static final Block STABLE_ENTROPY_BLOCK = registerBlock("stable_entropy_block",
new StableEntropyBlock(AbstractBlock.Settings.create()
properties -> new StableEntropyBlock(properties
.strength(5f)
.luminance(new ToIntFunction<BlockState>() {
@Override
@@ -43,52 +44,52 @@ public class ModBlocks {
.sounds(BlockSoundGroup.LODESTONE)));
public static final Block ENTROPY_ORE = registerBlock("entropy_ore",
new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
AbstractBlock.Settings.create()
properties -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
properties
.strength(3.0F, 3.0F)
.mapColor(MapColor.STONE_GRAY)
.requiresTool()
.sounds(BlockSoundGroup.STONE)));
public static final Block DEEPSLATE_ENTROPY_ORE = registerBlock("deepslate_entropy_ore",
new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
AbstractBlock.Settings.create()
properties -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
properties
.mapColor(MapColor.DEEPSLATE_GRAY)
.strength(4.5F, 3.0F)
.requiresTool()
.sounds(BlockSoundGroup.DEEPSLATE)));
public static final Block ENDTROPY_ORE = registerBlock("endtropy_ore",
new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
AbstractBlock.Settings.create()
properties -> new ExperienceDroppingBlock(UniformIntProvider.create(3, 7),
properties
.mapColor(MapColor.PALE_YELLOW)
.requiresTool()
.strength(3.0F, 9.0F)));
public static final Block RAW_ENDTROPY_BLOCK = registerBlock("raw_endtropy_block",
new RawEndtropyBlock(AbstractBlock.Settings.create()
properties -> new RawEndtropyBlock(properties
.strength(3f)
.requiresTool()
.sounds(BlockSoundGroup.AMETHYST_BLOCK)));
public static final Block STABLE_ENDTROPY_BLOCK = registerBlock("stable_endtropy_block",
new StableEndtropyBlock(AbstractBlock.Settings.create()
properties -> new StableEndtropyBlock(properties
.strength(3f)
.requiresTool()
.sounds(BlockSoundGroup.AMETHYST_BLOCK)));
public static final Block INFERNAL_ASHES_ORE = registerBlock("infernal_ashes_ore",
new ExperienceDroppingBlock(
properties -> new ExperienceDroppingBlock(
UniformIntProvider.create(0, 1),
AbstractBlock.Settings.create()
properties
.mapColor(MapColor.DARK_RED)
.requiresTool()
.strength(3.0F, 3.0F)
.sounds(BlockSoundGroup.NETHER_GOLD_ORE)));
public static final Block ENTROPIC_STABILIZER = registerBlock("entropic_stabilizer",
new EntropicStabilizer(
AbstractBlock.Settings.create()
properties -> new EntropicStabilizer(
properties
.mapColor(MapColor.LIGHT_GRAY)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.METAL)
@@ -96,16 +97,16 @@ public class ModBlocks {
));
public static final Block ENTROPIC_EVISCERATOR = registerBlock("entropic_eviscerator",
new EntropicEviscerator(
AbstractBlock.Settings.create()
properties -> new EntropicEviscerator(
properties
.mapColor(MapColor.LIGHT_GRAY)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.METAL)
.requiresTool()
));
public static final Block ENTROPIC_ENTANGLER = registerBlock("entropic_entangler",
new EntropicEntangler(
AbstractBlock.Settings.create()
properties -> new EntropicEntangler(
properties
.mapColor(MapColor.LIGHT_GRAY)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.METAL)
@@ -113,8 +114,8 @@ public class ModBlocks {
));
public static final Block ORDERED_CORE = registerBlock("ordered_core",
new HeavyCoreBlock(
AbstractBlock.Settings.create()
properties -> new HeavyCoreBlock(
properties
.mapColor(MapColor.IRON_GRAY)
.instrument(NoteBlockInstrument.SNARE)
.sounds(BlockSoundGroup.HEAVY_CORE)
@@ -125,24 +126,24 @@ public class ModBlocks {
public static final Block LEMONWOOD_LOG = registerBlock("lemonwood_log",
new PillarBlock(AbstractBlock.Settings.copy(Blocks.BIRCH_LOG)));
properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).sounds(BlockSoundGroup.WOOD)));
public static final Block LEMONWOOD_WOOD = registerBlock("lemonwood_wood",
new PillarBlock(AbstractBlock.Settings.copy(Blocks.BIRCH_WOOD).mapColor(MapColor.PALE_YELLOW)));
properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable()));
public static final Block STRIPPED_LEMONWOOD_LOG = registerBlock("stripped_lemonwood_log",
new PillarBlock(AbstractBlock.Settings.copy(Blocks.STRIPPED_BIRCH_LOG)));
properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable()));
public static final Block STRIPPED_LEMONWOOD_WOOD = registerBlock("stripped_lemonwood_wood",
new PillarBlock(AbstractBlock.Settings.copy(Blocks.STRIPPED_BIRCH_WOOD).mapColor(MapColor.PALE_YELLOW)));
properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable()));
public static final Block LEMONWOOD_LEAVES = registerBlock("lemonwood_leaves",
new LeavesBlock(AbstractBlock.Settings.copy(Blocks.BIRCH_LEAVES)));
properties -> new LeavesBlock(properties.mapColor(MapColor.DARK_GREEN).strength(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).nonOpaque().allowsSpawning(Blocks::canSpawnOnLeaves).suffocates(Blocks::never).blockVision(Blocks::never).burnable().pistonBehavior(PistonBehavior.DESTROY).solidBlock(Blocks::never)));
public static final Block LEMONWOOD_SAPLING = registerBlock("lemonwood_sapling",
new SaplingBlock(ModBlockSaplingGenerator.LEMONWOOD, AbstractBlock.Settings.copy(Blocks.BIRCH_SAPLING)));
properties -> new SaplingBlock(ModBlockSaplingGenerator.LEMONWOOD, properties.mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY)));
public static final Block POTTED_LEMONWOOD_SAPLING = registerBlock("potted_lemonwood_sapling", createFlowerPotBlock(LEMONWOOD_SAPLING));
public static final Block POTTED_LEMONWOOD_SAPLING = registerBlock("potted_lemonwood_sapling", properties -> new FlowerPotBlock(LEMONWOOD_SAPLING, properties.breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY)));
public static final Block LEMONWOOD_PLANKS = registerBlock("lemonwood_planks",
new Block(
AbstractBlock.Settings.create()
properties -> new Block(
properties
.mapColor(MapColor.PALE_YELLOW)
.instrument(NoteBlockInstrument.BASS)
.strength(2.0F, 3.0F)
@@ -152,16 +153,16 @@ public class ModBlocks {
public static final Block LEMONWOOD_STAIRS = registerBlock("lemonwood_stairs",
new StairsBlock(ModBlocks.LEMONWOOD_PLANKS.getDefaultState(),
AbstractBlock.Settings.create()
properties -> new StairsBlock(ModBlocks.LEMONWOOD_PLANKS.getDefaultState(),
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
.burnable()
));
public static final Block LEMONWOOD_SLAB = registerBlock("lemonwood_slab",
new SlabBlock(
AbstractBlock.Settings.create()
properties -> new SlabBlock(
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -169,8 +170,8 @@ public class ModBlocks {
));
public static final Block LEMONWOOD_BUTTON = registerBlock("lemonwood_button",
new ButtonBlock(BlockSetType.BIRCH, 10,
AbstractBlock.Settings.create()
properties -> new ButtonBlock(BlockSetType.BIRCH, 10,
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -178,8 +179,8 @@ public class ModBlocks {
.noCollision()
));
public static final Block LEMONWOOD_PRESSURE_PLATE = registerBlock("lemonwood_pressure_plate",
new PressurePlateBlock(BlockSetType.BIRCH,
AbstractBlock.Settings.create()
properties -> new PressurePlateBlock(BlockSetType.BIRCH,
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -187,24 +188,24 @@ public class ModBlocks {
));
public static final Block LEMONWOOD_FENCE = registerBlock("lemonwood_fence",
new FenceBlock(
AbstractBlock.Settings.create()
properties -> new FenceBlock(
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
.burnable()
));
public static final Block LEMONWOOD_FENCE_GATE = registerBlock("lemonwood_fence_gate",
new FenceGateBlock(WoodType.BIRCH,
AbstractBlock.Settings.create()
properties -> new FenceGateBlock(WoodType.BIRCH,
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
.burnable()
));
public static final Block LEMONWOOD_WALL = registerBlock("lemonwood_wall",
new WallBlock(
AbstractBlock.Settings.create()
properties -> new WallBlock(
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -212,8 +213,8 @@ public class ModBlocks {
));
public static final Block LEMONWOOD_DOOR = registerBlock("lemonwood_door",
new DoorBlock(BlockSetType.BIRCH,
AbstractBlock.Settings.create()
properties -> new DoorBlock(BlockSetType.BIRCH,
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -221,8 +222,8 @@ public class ModBlocks {
.nonOpaque()
));
public static final Block LEMONWOOD_TRAPDOOR = registerBlock("lemonwood_trapdoor",
new TrapdoorBlock(BlockSetType.BIRCH,
AbstractBlock.Settings.create()
properties -> new TrapdoorBlock(BlockSetType.BIRCH,
properties
.mapColor(MapColor.PALE_YELLOW)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -231,8 +232,8 @@ public class ModBlocks {
));
public static final Block LIZARD_PLANKS = registerBlock("lizard_planks",
new Block(
AbstractBlock.Settings.create()
properties -> new Block(
properties
.mapColor(MapColor.DARK_GREEN)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -240,8 +241,8 @@ public class ModBlocks {
));
public static final Block LIZARD_BUTTON = registerBlock("lizard_button",
new ButtonBlock(BlockSetType.BIRCH, 1,
AbstractBlock.Settings.create()
properties -> new ButtonBlock(BlockSetType.BIRCH, 1,
properties
.mapColor(MapColor.DARK_GREEN)
.strength(2.0F, 3.0F)
.sounds(BlockSoundGroup.WOOD)
@@ -261,7 +262,7 @@ public class ModBlocks {
});
public static final Block EVIL_BLOCK = registerBlock("evil_block",
new EvilBlock(AbstractBlock.Settings.create()
properties -> new EvilBlock(properties
.strength(5f)
.luminance(state -> state.get(EvilBlock.CLICKED) ? 15 : 0)
.requiresTool()
@@ -269,8 +270,8 @@ public class ModBlocks {
public static final Block PRISMA_STEEL_BLOCK = registerBlock(
"prisma_steel_block",
new Block(
AbstractBlock.Settings.create()
properties -> new Block(
properties
.mapColor(MapColor.IRON_GRAY)
.instrument(NoteBlockInstrument.IRON_XYLOPHONE)
.requiresTool()
@@ -281,8 +282,8 @@ public class ModBlocks {
public static final Block INFERNAL_ASHES_BLOCK = registerBlock(
"infernal_ashes_block",
new FallingBlock(
AbstractBlock.Settings.create()
properties -> new FallingBlock(
properties
.mapColor(MapColor.LIGHT_GRAY)
.instrument(NoteBlockInstrument.SNARE)
.strength(0.5F)
@@ -297,8 +298,8 @@ public class ModBlocks {
public static final Block CRYSTAL_ENTROPY = registerBlock(
"crystal_entropy",
new TransparentBlock(
AbstractBlock.Settings.create()
properties -> new TransparentBlock(
properties
.instrument(NoteBlockInstrument.HAT)
.strength(0.3F)
.sounds(BlockSoundGroup.GLASS)
@@ -312,8 +313,8 @@ public class ModBlocks {
public static final Block CRYSTAL_ENTROPY_PANE = registerBlock(
"crystal_entropy_pane",
new PaneBlock(
AbstractBlock.Settings.create()
properties -> new PaneBlock(
properties
.instrument(NoteBlockInstrument.HAT)
.strength(0.3F)
.sounds(BlockSoundGroup.GLASS)
@@ -321,8 +322,8 @@ public class ModBlocks {
)
);
public static final Block TOBACCO_CROP = registerBlockWithoutItem("tobacco_crop", new TobaccoCrop(
AbstractBlock.Settings.create()
public static final Block TOBACCO_CROP = registerBlockWithoutItem("tobacco_crop", properties -> new TobaccoCrop(
properties
.mapColor(MapColor.DARK_GREEN)
.noCollision()
.ticksRandomly()
@@ -332,8 +333,8 @@ public class ModBlocks {
));
public static final Block ASHEN_STEEL_BLOCK = registerBlock(
"ashen_steel_block",
new Block(
AbstractBlock.Settings.create()
properties -> new Block(
properties
.mapColor(MapColor.IRON_GRAY)
.instrument(NoteBlockInstrument.IRON_XYLOPHONE)
.requiresTool()
@@ -342,18 +343,21 @@ public class ModBlocks {
)
);
private static Block registerBlockWithoutItem(String name, Block block){
return Registry.register(Registries.BLOCK, Identifier.of(AcesBS.MOD_ID, name), block);
private static Block registerBlock(String name, Function<AbstractBlock.Settings, Block> function) {
Block toRegister = function.apply(AbstractBlock.Settings.create().registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(AcesBS.MOD_ID, name))));
registerBlockItem(name, toRegister);
return Registry.register(Registries.BLOCK, Identifier.of(AcesBS.MOD_ID, name), toRegister);
}
private static Block registerBlock(String name, Block block){
registerBlockItem(name, block);
return Registry.register(Registries.BLOCK, Identifier.of(AcesBS.MOD_ID, name), block);
private static Block registerBlockWithoutItem(String name, Function<AbstractBlock.Settings, Block> function) {
return Registry.register(Registries.BLOCK, Identifier.of(AcesBS.MOD_ID, name),
function.apply(AbstractBlock.Settings.create().registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(AcesBS.MOD_ID, name)))));
}
private static void registerBlockItem(String name, Block block){
private static void registerBlockItem(String name, Block block) {
Registry.register(Registries.ITEM, Identifier.of(AcesBS.MOD_ID, name),
new BlockItem(block, new Item.Settings()));
new BlockItem(block, new Item.Settings().useBlockPrefixedTranslationKey()
.registryKey(RegistryKey.of(RegistryKeys.ITEM, Identifier.of(AcesBS.MOD_ID, name)))));
}
public static void registerModBlocks(){
src/main/java/com/acethewildfire/acesbs/block/custom/EntropicEntangler.java
+5 -5
View File
@@ -12,10 +12,10 @@ import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.DirectionProperty;
import net.minecraft.state.property.EnumProperty;
import net.minecraft.state.property.Properties;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.ItemActionResult;
import net.minecraft.util.ItemScatterer;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
@@ -24,7 +24,7 @@ import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
public class EntropicEntangler extends BlockWithEntity implements BlockEntityProvider {
public static final DirectionProperty FACING = Properties.HORIZONTAL_FACING;
public static final EnumProperty<Direction> FACING = Properties.HORIZONTAL_FACING;
public static final MapCodec<EntropicEntangler> CODEC = EntropicEntangler.createCodec(EntropicEntangler::new);
public EntropicEntangler(Settings settings) {
@@ -60,7 +60,7 @@ public class EntropicEntangler extends BlockWithEntity implements BlockEntityPro
}
@Override
protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
if (!world.isClient) {
NamedScreenHandlerFactory screenHandlerFactory = ((EntropicEntanglerEntity) world.getBlockEntity(pos));
@@ -68,7 +68,7 @@ public class EntropicEntangler extends BlockWithEntity implements BlockEntityPro
player.openHandledScreen(screenHandlerFactory);
}
}
return ItemActionResult.SUCCESS;
return ActionResult.SUCCESS;
}

Some files were not shown because too many files have changed in this diff Show More