minecraft
/
PhysicalConnectivity
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Fix cable recipes, advancements, loot tables, and face device drops

This commit is contained in:
Shadowfacts 2021-03-15 19:06:17 -04:00
parent bc50017b4a
commit ee6fb1e725
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
42 changed files with 703 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/net/shadowfacts/phycon/block/FaceDeviceBlock.kt
View File

@ -4,6 +4,8 @@ import net.minecraft.block.Block
import net.minecraft.block.BlockState
import net.minecraft.block.ShapeContext
import net.minecraft.item.ItemPlacementContext
import net.minecraft.item.ItemStack
import net.minecraft.server.world.ServerWorld
import net.minecraft.state.StateManager
import net.minecraft.state.property.EnumProperty
import net.minecraft.state.property.Properties
@ -14,11 +16,11 @@ import net.minecraft.util.math.Direction
import net.minecraft.util.shape.VoxelShape
import net.minecraft.util.shape.VoxelShapes
import net.minecraft.world.BlockView
import net.minecraft.world.World
import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.api.Interface
import net.shadowfacts.phycon.api.NetworkComponentBlock
import net.shadowfacts.phycon.block.cable.CableBlock
import net.shadowfacts.phycon.init.PhyItems
import java.util.*
@ -160,4 +162,11 @@ abstract class FaceDeviceBlock<T: DeviceBlockEntity>(settings: Settings): Device
override fun getOutlineShape(state: BlockState, world: BlockView, pos: BlockPos, context: ShapeContext): VoxelShape {
return getShape(state[FACING], state[CABLE_CONNECTION])
}
override fun onStacksDropped(state: BlockState, world: ServerWorld, pos: BlockPos, stack: ItemStack) {
super.onStacksDropped(state, world, pos, stack)
val cableStack = ItemStack(PhyItems.CABLES[state[COLOR]])
dropStack(world, pos, cableStack)
}
}

3
src/main/kotlin/net/shadowfacts/phycon/item/ScrewdriverItem.kt
View File

@ -82,7 +82,8 @@ class ScrewdriverItem: Item(Settings().maxCount(1)) {
val faceShape = block.faceShapes[state[FaceDeviceBlock.FACING]]!!
// if we hit the face part of block, leave the cable behind
if (faceShape.boundingBox.containsInclusive(hitInsideBlock)) {
return (state.block as CableBlock).getInitialState(context.world, context.blockPos)
val cableBlock = PhyBlocks.CABLES[state[FaceDeviceBlock.COLOR]]!!
return cableBlock.getInitialState(context.world, context.blockPos)
} else {
if (!context.world.isClient) {
val cable = ItemEntity(context.world, context.blockPos.x.toDouble(), context.blockPos.y.toDouble(), context.blockPos.z.toDouble(), ItemStack(state.block))

5
src/main/resources/data/phycon/advancements/cable.json
View File

@ -2,7 +2,7 @@
"parent": "phycon:root",
"display": {
"icon": {
"item": "phycon:cable"
"item": "phycon:cable_blue"
},
"title": {
"translate": "advancements.phycon.cable.title"
@ -19,9 +19,8 @@
"cable": {
"trigger": "minecraft:placed_block",
"conditions": {
"block": "phycon:cable",
"item": {
"item": "phycon:cable"
"tag": "phycon:cable"
}
}
}

128
src/main/resources/data/phycon/advancements/recipes/cable.json
View File

@ -2,7 +2,22 @@
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"phycon:cable"
"phycon:cable/white",
"phycon:cable/orange",
"phycon:cable/magenta",
"phycon:cable/light_blue",
"phycon:cable/yellow",
"phycon:cable/lime",
"phycon:cable/pink",
"phycon:cable/gray",
"phycon:cable/light_gray",
"phycon:cable/cyan",
"phycon:cable/purple",
"phycon:cable/blue",
"phycon:cable/brown",
"phycon:cable/green",
"phycon:cable/red",
"phycon:cable/black"
]
},
"criteria": {
@ -16,17 +31,122 @@
]
}
},
"has_the_recipe": {
"has_white_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable"
"recipe": "phycon:cable/white"
}
},
"has_orange_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/orange"
}
},
"has_magenta_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/magenta"
}
},
"has_light_blue_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/light_blue"
}
},
"has_yellow_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/yellow"
}
},
"has_lime_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/lime"
}
},
"has_pink_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/pink"
}
},
"has_gray_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/gray"
}
},
"has_light_gray_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/light_gray"
}
},
"has_cyan_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/cyan"
}
},
"has_purple_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/purple"
}
},
"has_blue_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/blue"
}
},
"has_brown_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/brown"
}
},
"has_green_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/green"
}
},
"has_red_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/red"
}
},
"has_black_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:cable/black"
}
}
},
"requirements": [
[
"has_twisted_pair",
"has_the_recipe"
"has_white_recipe",
"has_orange_recipe",
"has_magenta_recipe",
"has_light_blue_recipe",
"has_yellow_recipe",
"has_lime_recipe",
"has_pink_recipe",
"has_gray_recipe",
"has_light_gray_recipe",
"has_cyan_recipe",
"has_purple_recipe",
"has_blue_recipe",
"has_brown_recipe",
"has_green_recipe",
"has_red_recipe",
"has_black_recipe"
]
]
}

2
src/main/resources/data/phycon/advancements/recipes/switch.json
View File

@ -11,7 +11,7 @@
"conditions": {
"items": [
{
"item": "phycon:cable"
"tag": "phycon:cable"
}
]
}

19
src/main/resources/data/phycon/loot_tables/blocks/cable_black.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_blue.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_brown.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_cyan.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_gray.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_green.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_light_blue.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_light_gray.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_lime.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_magenta.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_orange.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_pink.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_purple.json Normal file
View File

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

2
src/main/resources/data/phycon/loot_tables/blocks/cable.json → src/main/resources/data/phycon/loot_tables/blocks/cable_red.json
View File

@ -6,7 +6,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "phycon:cable"
"name": "phycon:cable_red"
}
],
"conditions": [

19
src/main/resources/data/phycon/loot_tables/blocks/cable_white.json Normal file
View File

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

19
src/main/resources/data/phycon/loot_tables/blocks/cable_yellow.json Normal file
View File

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

14
src/main/resources/data/phycon/loot_tables/blocks/network_interface.json
View File

@ -14,20 +14,6 @@
"condition": "minecraft:survives_explosion"
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "phycon:cable"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

14
src/main/resources/data/phycon/loot_tables/blocks/redstone_controller.json
View File

@ -14,20 +14,6 @@
"condition": "minecraft:survives_explosion"
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "phycon:cable"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

14
src/main/resources/data/phycon/loot_tables/blocks/redstone_emitter.json
View File

@ -14,20 +14,6 @@
"condition": "minecraft:survives_explosion"
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "phycon:cable"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

17
src/main/resources/data/phycon/recipes/cable/black.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:black_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_black",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/blue.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:blue_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_blue",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/brown.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:brown_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_brown",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/cyan.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:cyan_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_cyan",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/gray.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:gray_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_gray",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/green.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:green_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_green",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/light_blue.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:light_blue_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_light_blue",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/light_gray.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:light_gray_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_light_gray",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/lime.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:lime_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_lime",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/magenta.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:orange_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_orange",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/orange.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:orange_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_orange",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/pink.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:pink_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_pink",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/purple.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:purple_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_purple",
"count": 3
}
}

4
src/main/resources/data/phycon/recipes/cable.json → src/main/resources/data/phycon/recipes/cable/red.json
View File

@ -6,12 +6,12 @@
"CCC"
],
"key": {
"C": {"tag": "minecraft:carpets"},
"C": {"item": "minecraft:red_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable",
"item": "phycon:cable_red",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/white.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:white_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_white",
"count": 3
}
}

17
src/main/resources/data/phycon/recipes/cable/yellow.json Normal file
View File

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"TRT",
"CCC"
],
"key": {
"C": {"item": "minecraft:yellow_carpet"},
"T": {"item": "phycon:twisted_pair"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:cable_yellow",
"count": 3
}
}

2
src/main/resources/data/phycon/recipes/switch.json
View File

@ -7,7 +7,7 @@
],
"key": {
"S": {"item": "phycon:silicon_wafer"},
"C": {"item": "phycon:cable"},
"C": {"tag": "phycon:cable"},
"I": {"tag": "c:iron_ingots"}
},
"result": {

20
src/main/resources/data/phycon/tags/items/cable.json Normal file
View File

@ -0,0 +1,20 @@
{
"values": [
"phycon:cable_white",
"phycon:cable_orange",
"phycon:cable_magenta",
"phycon:cable_light_blue",
"phycon:cable_yellow",
"phycon:cable_lime",
"phycon:cable_pink",
"phycon:cable_gray",
"phycon:cable_light_gray",
"phycon:cable_cyan",
"phycon:cable_purple",
"phycon:cable_blue",
"phycon:cable_brown",
"phycon:cable_green",
"phycon:cable_red",
"phycon:cable_black"
]
}