Minecraft/Fellies
1
0
Fork 0
mirror of https://git.fellies.tech/minecraft/fellies.git synced 2021-02-13 10:18:48 +00:00
Code Releases 2 Activity

v0.8-1.16.5-36.0.14

Browse Source
This commit is contained in:
Citali
2021-02-07 11:31:29 +01:00
parent 53798412f5
commit c7552e3c9a
19 changed files with 327 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Changelog.md
View File

@ -2,32 +2,14 @@
## Additions ## Additions
- Add Runelic (1.16.5-7.0.1)
## Removals ## Removals
## Updates ## 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 ## 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

5
kubejs/assets/kubejs/blockstates/graphite_block.js Normal file
View File

@ -0,0 +1,5 @@
{
"variants": {
"normal": [{"model": "kubejs:graphite_block"}]
}
}

4
kubejs/assets/kubejs/lang/en_us.json Normal file
View File

@ -0,0 +1,4 @@
{
"block.kubejs.graphite_block": "Graphite",
"item.kubejs.diamond_nugget": "Diamond Nugget"
}

6
kubejs/assets/kubejs/models/block/graphite_block.js Normal file
View File

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "kubejs:blocks/graphite_block"
}
}

0
kubejs/assets/kubejs/textures/item/graphite_two.png → kubejs/assets/kubejs/textures/block/graphite_block.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 912 B

BIN
kubejs/assets/kubejs/textures/item/graphite_one.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 756 B

BIN
kubejs/assets/kubejs/textures/item/graphite_three.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 597 B

1
kubejs/client_scripts/jei_hide_items.js
View File

@ -1,5 +1,4 @@
events.listen('jei.hide.items', (event) => { events.listen('jei.hide.items', (event) => {
event.hide('/appliedenergistics2:facade/'); event.hide('/appliedenergistics2:facade/');
event.hide('thermal:bitumen'); event.hide('thermal:bitumen');
event.hide('/apatite/');
}); });

48
kubejs/data/minecraft/loot_tables/blocks/coal_ore.json Normal file
View File

@ -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"
}
]
}
]
}
]
}

48
kubejs/data/minecraft/loot_tables/blocks/diamond_ore.json Normal file
View File

@ -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"
}
]
}
]
}
]
}

48
kubejs/data/minecraft/loot_tables/blocks/emerald_ore.json Normal file
View File

@ -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"
}
]
}
]
}
]
}

19
kubejs/data/minecraft/loot_tables/blocks/gold_ore.json Normal file
View File

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "emendatusenigmatica:gold_chunk"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

19
kubejs/data/minecraft/loot_tables/blocks/iron_ore.json Normal file
View File

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "emendatusenigmatica:iron_chunk"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

56
kubejs/data/minecraft/loot_tables/blocks/lapis_ore.json Normal file
View File

@ -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"
}
]
}
]
}
]
}

56
kubejs/data/minecraft/loot_tables/blocks/redstone_ore.json Normal file
View File

@ -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"
}
]
}
]
}
]
}

5
kubejs/server_scripts/fellies/kubejs/recipes/create/create.js
View File

@ -18,5 +18,8 @@ events.listen('recipes', e => {
pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting
} = e.recipes.create; } = 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();
}); });

3
kubejs/server_scripts/fellies/kubejs/recipes/replace.js
View File

@ -1,6 +1,9 @@
// priority: 98 // priority: 98
events.listen('recipes', e => { events.listen('recipes', e => {
// Create
e.replaceInput({id: 'create:pressing/lapis_block'}, 'minecraft:lapis_block', '#forge:gems/lapis');
// Mana and Artifice // Mana and Artifice
e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane'); e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane');
}); });

3
kubejs/startup_scripts/blocks.js Normal file
View File

@ -0,0 +1,3 @@
events.listen('block.registry', e => {
e.create('graphite_block').material('rock').hardness(0.5).add()
});

8
kubejs/startup_scripts/items.js
View File

@ -1,6 +1,4 @@
events.listen('item.registry', function (event) { events.listen('item.registry', e => {
event.create('diamond_nugget').group('fellies').displayName('Diamond Nugget'); e.createBlockItem('graphite_block').add();
event.create('graphite_one').group('fellies').displayName('Graphite 1'); e.create('diamond_nugget').add();
event.create('graphite_two').group('fellies').displayName('Graphite 2');
event.create('graphite_three').group('fellies').displayName('Graphite 3');
}); });