diff --git a/kubejs/assets/createastral/models/item/marimo.json b/kubejs/assets/createastral/models/item/marimo.json index a8f8f95da..4d970f656 100644 --- a/kubejs/assets/createastral/models/item/marimo.json +++ b/kubejs/assets/createastral/models/item/marimo.json @@ -18,5 +18,33 @@ "down": {"uv": [12, 0, 8, 4], "texture": "#0"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, 0, 4], + "translation": [-1, 0.5, 0] + }, + "thirdperson_lefthand": { + "rotation": [75, 52, -4.5], + "translation": [-0.25, -1.25, 13.75] + }, + "firstperson_righthand": { + "translation": [2.5, 0, 0] + }, + "firstperson_lefthand": { + "translation": [10.75, 11.5, 0] + }, + "gui": { + "rotation": [15, 135, 0], + "scale": [2, 2, 2] + }, + "head": { + "rotation": [0, -50, 0], + "translation": [0, 8.5, 0] + }, + "fixed": { + "translation": [0, 0, -1.5], + "scale": [1.5, 1.5, 1.5] + } + } } \ No newline at end of file diff --git a/kubejs/assets/createastral/models/item/moonset_marimo.json b/kubejs/assets/createastral/models/item/moonset_marimo.json new file mode 100644 index 000000000..7e7bde969 --- /dev/null +++ b/kubejs/assets/createastral/models/item/moonset_marimo.json @@ -0,0 +1,50 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "createastral:item/marimo/moonset_marimo", + "particle": "createastral:item/marimo/moonset_marimo" + }, + "elements": [ + { + "from": [6, 6, 6], + "to": [10, 10, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 6, 6]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#0"}, + "south": {"uv": [4, 0, 8, 4], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 8], "texture": "#0"}, + "up": {"uv": [4, 12, 0, 8], "texture": "#0"}, + "down": {"uv": [12, 0, 8, 4], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, 0, 4], + "translation": [-1, 0.5, 0] + }, + "thirdperson_lefthand": { + "rotation": [75, 52, -4.5], + "translation": [-0.25, -1.25, 13.75] + }, + "firstperson_righthand": { + "translation": [2.5, 0, 0] + }, + "firstperson_lefthand": { + "translation": [10.75, 11.5, 0] + }, + "gui": { + "rotation": [15, 135, 0], + "scale": [2, 2, 2] + }, + "head": { + "rotation": [0, -50, 0], + "translation": [0, 8.5, 0] + }, + "fixed": { + "translation": [0, 0, -1.5], + "scale": [1.5, 1.5, 1.5] + } + } +} \ No newline at end of file diff --git a/kubejs/assets/createastral/textures/item/marimo/marimo.png b/kubejs/assets/createastral/textures/item/marimo/marimo.png index a6edca7db..4a87759a2 100644 Binary files a/kubejs/assets/createastral/textures/item/marimo/marimo.png and b/kubejs/assets/createastral/textures/item/marimo/marimo.png differ diff --git a/kubejs/assets/createastral/textures/item/marimo/moonset_marimo.png b/kubejs/assets/createastral/textures/item/marimo/moonset_marimo.png new file mode 100644 index 000000000..b45bc7eef Binary files /dev/null and b/kubejs/assets/createastral/textures/item/marimo/moonset_marimo.png differ diff --git a/kubejs/server_scripts/create.js b/kubejs/server_scripts/create.js index 128117276..dc98836f2 100644 --- a/kubejs/server_scripts/create.js +++ b/kubejs/server_scripts/create.js @@ -1511,6 +1511,59 @@ function mixingRecipes(event) { // Time: Mixing time in ticks [ { + output: [ + Item.of("2x createastral:marimo").withChance(0.5), + Item.of("2x createastral:moonset_marimo").withChance(0.5), + { + fluid: "minecraft:water", + amount: BUCKET, + } + ], + input: [ + "createastral:marimo", + "createastral:moonset_marimo", + { + fluid: "minecraft:water", + amount: BUCKET, + } + ], + heat: "", + time: 60, + }, + { + output: [ + "1x createastral:moonset_marimo" + ], + input: [ + "createastral:marimo", + "astraladditions:moonset_crystal", + { + fluid: "kubejs:shimmer", + amount: BUCKET/2, + } + ], + heat: "", + time: 180, + }, + { + output: [ + "2x createastral:marimo", + { + fluid: "minecraft:water", + amount: BUCKET/2, + } + ], + input: [ + "createastral:marimo", + { + fluid: "minecraft:water", + amount: BUCKET/2, + } + ], + heat: "", + time: 60, + }, + { output: [{ fluid: "milk:still_milk", amount: BUCKET/2, @@ -1750,6 +1803,18 @@ function mixingRecipes(event) { ], heat: "heated", time: 1000, + }, + { + output: "techreborn:plantball", + input: [ + "9x createastral:marimo", + { + fluid: "createaddition:seed_oil", + amount: 500 * mB, + }, + ], + heat: "heated", + time: 1000, }, { output: "techreborn:plantball", @@ -2604,6 +2669,9 @@ function mixingRecipes(event) { function cuttingRecipes(event) { // [Input string, Output string] [ + ["createastral:marimo", "minecraft:seagrass"], + ["minecraft:moss_block", "2x minecraft:moss_carpet"], + ["minecraft:moss_carpet", "2x createastral:marimo"], ["techreborn:rubber_log", "techreborn:rubber_log_stripped"], ["techreborn:rubber_wood", "techreborn:stripped_rubber_wood"], ["techreborn:rubber_log_stripped", "6x techreborn:rubber_planks"], @@ -3356,6 +3424,30 @@ function farmersDelightIntegration(event) { function compactingRecipes(event) { [ + { + output: "minecraft:dirt", + inputs: ["64x createastral:marimo"], + }, + { + output: "minecraft:grass", + inputs: ["minecraft:seagrass"], + }, + { + output: { fluid: "tconstruct:molten_ender", amount: 250 * mB }, + inputs: ["4x createastral:moonset_marimo", "4x ae2:fluix_dust", { fluid: "tconstruct:ender_slime", amount: 500 * mB }], + }, + { + output: "astraladditions:moonset_crystal", + inputs: ["8x createastral:moonset_marimo", "minecraft:ender_pearl"], + }, + { + output: "minecraft:chorus_flower", + inputs: ["8x createastral:moonset_marimo", "minecraft:chorus_fruit"], + }, + { + output: { fluid: "minecraft:water", amount: 500 * mB }, + inputs: ["createastral:marimo"], + }, { output: "minecraft:calcite", inputs: ["minecraft:gravel", "2x minecraft:bone_meal"], diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js index 6ec899e34..7a06a0117 100644 --- a/kubejs/startup_scripts/item_registry.js +++ b/kubejs/startup_scripts/item_registry.js @@ -46,6 +46,7 @@ onEvent("item.registry", (event) => { event.create("createastral:broken_fragile_rocket_fin"); event.create("createastral:gold_casted_rocket_fin"); event.create("createastral:marimo"); + event.create("createastral:moonset_marimo"); //Astral Foods event