diff --git a/Changelog.md b/Changelog.md index 575580b..fee9034 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,32 +2,14 @@ ## Additions -- Add Runelic (1.16.5-7.0.1) - ## Removals ## Updates -- Update achitectury (1.5.105 to 1.5.107) -- Update BotanyPots (1.16.5-7.0.2 to 1.16.5-7.0.6) -- Update Cyclic (1.16.5-1.1.5 to 1.16.5-1.1.6) -- Update dungeons_plus (1.16.4-1.1.2 to 1.16.4-1.1.3) -- Update engineerstools (1.16.4-1.1.3 to 1.16.4-1.1.4) -- Update envirocore (1.16.4-3.0.7.0 to 1.16.5-3.0.7.1) -- Update envirotech (1.16.4-3.0.7.0 to 1.16.5-3.0.7.1) -- Update ftb-gui-library (1605.2.1.37 to 1605.2.1.38) -- Update geckolib (1.16.5-3.0.11 to 1.16.5-3.0.12) -- Update industrial-foregoing (1.16.5-3.2.9.1 to 1.16.5-3.2.9.2) -- Update kubejs (1605-3.6.160 to 1605-3.6.162) -- Update mcjtylib (1.16-5.0.15 to 1.16-5.0.16) -- Update rftoolscontrol (1.16-4.0.6 to 1.16-4.0.7) -- Update rftoolsstorage (1.16-2.0.8 to 1.16-2.0.9) -- Update rftoolsutility (1.16-3.0.20 to 1.16-3.0.21) -- Update rsgauges (1.16.4-1.2.8 to 1.16.4-1.2.9-b1) -- Update titanium (1.16.4-3.2.6.1 to 1.16.5-3.2.6.2) -- Update trashcans (1.16.4-1.0.6a to 1.16.4-1.0.7) -- Update valkyrielib (1.16.4-3.0.7.0 to 1.16.5-3.0.7.1) - ## Changes -- Change kubejs recepies and worldgen +### Kubejs + +- Change vanilla ore drops +- Change create lapis press recipe +- Add new graphite block and recipe to create diamond with create diff --git a/kubejs/assets/kubejs/blockstates/graphite_block.js b/kubejs/assets/kubejs/blockstates/graphite_block.js new file mode 100644 index 0000000..24931cb --- /dev/null +++ b/kubejs/assets/kubejs/blockstates/graphite_block.js @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": [{"model": "kubejs:graphite_block"}] + } +} \ No newline at end of file diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json new file mode 100644 index 0000000..73fe01d --- /dev/null +++ b/kubejs/assets/kubejs/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "block.kubejs.graphite_block": "Graphite", + "item.kubejs.diamond_nugget": "Diamond Nugget" +} diff --git a/kubejs/assets/kubejs/models/block/graphite_block.js b/kubejs/assets/kubejs/models/block/graphite_block.js new file mode 100644 index 0000000..26c08af --- /dev/null +++ b/kubejs/assets/kubejs/models/block/graphite_block.js @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "kubejs:blocks/graphite_block" + } +} \ No newline at end of file diff --git a/kubejs/assets/kubejs/textures/item/graphite_two.png b/kubejs/assets/kubejs/textures/block/graphite_block.png similarity index 100% rename from kubejs/assets/kubejs/textures/item/graphite_two.png rename to kubejs/assets/kubejs/textures/block/graphite_block.png diff --git a/kubejs/assets/kubejs/textures/item/graphite_one.png b/kubejs/assets/kubejs/textures/item/graphite_one.png deleted file mode 100644 index bc7ee2b..0000000 Binary files a/kubejs/assets/kubejs/textures/item/graphite_one.png and /dev/null differ diff --git a/kubejs/assets/kubejs/textures/item/graphite_three.png b/kubejs/assets/kubejs/textures/item/graphite_three.png deleted file mode 100644 index cf53f0b..0000000 Binary files a/kubejs/assets/kubejs/textures/item/graphite_three.png and /dev/null differ diff --git a/kubejs/client_scripts/jei_hide_items.js b/kubejs/client_scripts/jei_hide_items.js index 1c17b38..7b5ce86 100644 --- a/kubejs/client_scripts/jei_hide_items.js +++ b/kubejs/client_scripts/jei_hide_items.js @@ -1,5 +1,4 @@ events.listen('jei.hide.items', (event) => { event.hide('/appliedenergistics2:facade/'); event.hide('thermal:bitumen'); - event.hide('/apatite/'); }); \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/coal_ore.json b/kubejs/data/minecraft/loot_tables/blocks/coal_ore.json new file mode 100644 index 0000000..d86472b --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/coal_ore.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "emendatusenigmatica:coal_chunk" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:coal" + } + ] + } + ] + } + ] +} diff --git a/kubejs/data/minecraft/loot_tables/blocks/diamond_ore.json b/kubejs/data/minecraft/loot_tables/blocks/diamond_ore.json new file mode 100644 index 0000000..e14cac2 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/diamond_ore.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "emendatusenigmatica:diamond_chunk" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:diamond" + } + ] + } + ] + } + ] +} diff --git a/kubejs/data/minecraft/loot_tables/blocks/emerald_ore.json b/kubejs/data/minecraft/loot_tables/blocks/emerald_ore.json new file mode 100644 index 0000000..548285e --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/emerald_ore.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "emendatusenigmatica:emerald_chunk" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:emerald" + } + ] + } + ] + } + ] +} diff --git a/kubejs/data/minecraft/loot_tables/blocks/gold_ore.json b/kubejs/data/minecraft/loot_tables/blocks/gold_ore.json new file mode 100644 index 0000000..6fb0a7f --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/gold_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "emendatusenigmatica:gold_chunk" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/kubejs/data/minecraft/loot_tables/blocks/iron_ore.json b/kubejs/data/minecraft/loot_tables/blocks/iron_ore.json new file mode 100644 index 0000000..dd4cdd4 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/iron_ore.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "emendatusenigmatica:iron_chunk" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/kubejs/data/minecraft/loot_tables/blocks/lapis_ore.json b/kubejs/data/minecraft/loot_tables/blocks/lapis_ore.json new file mode 100644 index 0000000..de09fe6 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/lapis_ore.json @@ -0,0 +1,56 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "emendatusenigmatica:lapis_chunk" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4.0, + "max": 9.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:lapis_lazuli" + } + ] + } + ] + } + ] +} diff --git a/kubejs/data/minecraft/loot_tables/blocks/redstone_ore.json b/kubejs/data/minecraft/loot_tables/blocks/redstone_ore.json new file mode 100644 index 0000000..8207e71 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/redstone_ore.json @@ -0,0 +1,56 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "emendatusenigmatica:redstone_chunk" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 4.0, + "max": 5.0, + "type": "minecraft:uniform" + } + }, + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:redstone" + } + ] + } + ] + } + ] +} diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js b/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js index 4a50aac..64aa41c 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js @@ -18,5 +18,8 @@ events.listen('recipes', e => { pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting } = e.recipes.create; - pressing(Item.of('#forge:storage_blocks/coal', 9), 'kubejs:graphite_one'); + compacting('kubejs:graphite_block', ['#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal','#forge:storage_blocks/coal']).heated(); + compacting('kubejs:graphite_block', ['#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal','#forge:storage_blocks/charcoal']).heated(); + compacting('kubejs:diamond_nugget', ['kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block', 'kubejs:graphite_block']).superheated(); + compacting('minecraft:diamond', ['kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget', 'kubejs:diamond_nugget']).superheated(); }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js index 09e97c4..ab70235 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js @@ -1,6 +1,9 @@ // priority: 98 events.listen('recipes', e => { + // Create + e.replaceInput({id: 'create:pressing/lapis_block'}, 'minecraft:lapis_block', '#forge:gems/lapis'); + // Mana and Artifice e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane'); }); \ No newline at end of file diff --git a/kubejs/startup_scripts/blocks.js b/kubejs/startup_scripts/blocks.js new file mode 100644 index 0000000..a43423b --- /dev/null +++ b/kubejs/startup_scripts/blocks.js @@ -0,0 +1,3 @@ +events.listen('block.registry', e => { + e.create('graphite_block').material('rock').hardness(0.5).add() +}); diff --git a/kubejs/startup_scripts/items.js b/kubejs/startup_scripts/items.js index 91ec98a..3a835aa 100644 --- a/kubejs/startup_scripts/items.js +++ b/kubejs/startup_scripts/items.js @@ -1,6 +1,4 @@ -events.listen('item.registry', function (event) { - event.create('diamond_nugget').group('fellies').displayName('Diamond Nugget'); - event.create('graphite_one').group('fellies').displayName('Graphite 1'); - event.create('graphite_two').group('fellies').displayName('Graphite 2'); - event.create('graphite_three').group('fellies').displayName('Graphite 3'); +events.listen('item.registry', e => { + e.createBlockItem('graphite_block').add(); + e.create('diamond_nugget').add(); });