Skip to content

Commit

Permalink
Revert "Feat: Create contraptions to animate" (#549)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yarden-zamir authored Jan 25, 2024
2 parents 68e0730 + d42c44d commit a26062a
Show file tree
Hide file tree
Showing 32 changed files with 1 addition and 639 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,3 @@ config/bcc-common.toml
mods/.index/figura.pw.toml
kubejs/translation_tools/missing_translations/*.missing.json
kubejs/allEnglishTranslationKeys.json

/schmatics/
/contraptions/
2 changes: 1 addition & 1 deletion config/carryon-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
[blacklist]
#Blacklist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config
#Blocks that cannot be picked up
forbiddenTiles = ["supplementaries:cage", "#forge:immovable", "#forge:relocation_not_supported", "minecraft:end_portal", "minecraft:piston_head", "minecraft:end_gateway", "minecraft:tall_grass", "minecraft:large_fern", "minecraft:peony", "minecraft:rose_bush", "minecraft:lilac", "minecraft:sunflower", "minecraft:*_bed", "minecraft:*_door", "minecraft:big_dripleaf_stem", "minecraft:waterlily", "minecraft:cake", "minecraft:nether_portal", "minecraft:tall_seagrass", "animania:block_trough", "animania:block_invisiblock", "colossalchests:*", "ic2:*", "bigreactors:*", "forestry:*", "tconstruct:*", "rustic:*", "botania:*", "astralsorcery:*", "quark:colored_bed_*", "immersiveengineering:*", "embers:block_furnace", "embers:ember_bore", "embers:ember_activator", "embers:mixer", "embers:heat_coil", "embers:large_tank", "embers:crystal_cell", "embers:alchemy_pedestal", "embers:boiler", "embers:combustor", "embers:catalzyer", "embers:field_chart", "embers:inferno_forge", "storagedrawers:framingtable", "skyresources:*", "lootbags:*", "exsartagine:*", "aquamunda:tank", "opencomputers:*", "malisisdoors:*", "industrialforegoing:*", "minecolonies:*", "thaumcraft:pillar*", "thaumcraft:infernal_furnace", "thaumcraft:placeholder*", "thaumcraft:infusion_matrix", "thaumcraft:golem_builder", "thaumcraft:thaumatorium*", "magneticraft:oil_heater", "magneticraft:solar_panel", "magneticraft:steam_engine", "magneticraft:shelving_unit", "magneticraft:grinder", "magneticraft:sieve", "magneticraft:solar_tower", "magneticraft:solar_mirror", "magneticraft:container", "magneticraft:pumpjack", "magneticraft:solar_panel", "magneticraft:refinery", "magneticraft:oil_heater", "magneticraft:hydraulic_press", "magneticraft:multiblock_gap", "refinedstorage:*", "mcmultipart:*", "enderstorage:*", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*", "forgemultipartcbe:*", "integrateddynamics:cable", "mekanismgenerators:wind_generator", "cookingforblockheads:cabinet", "cookingforblockheads:corner", "cookingforblockheads:counter", "cookingforblockheads:oven", "cookingforblockheads:toaster", "cookingforblockheads:milk_jar", "cookingforblockheads:cow_jar", "cookingforblockheads:fruit_basket", "cookingforblockheads:cooking_table", "cookingforblockheads:fridge", "cookingforblockheads:sink", "powah:*", "advancementtrophies:trophy", "mekanismgenerators:heat_generator", "mna:filler_block", "ptdye:animation_block"]
forbiddenTiles = ["supplementaries:cage", "#forge:immovable", "#forge:relocation_not_supported", "minecraft:end_portal", "minecraft:piston_head", "minecraft:end_gateway", "minecraft:tall_grass", "minecraft:large_fern", "minecraft:peony", "minecraft:rose_bush", "minecraft:lilac", "minecraft:sunflower", "minecraft:*_bed", "minecraft:*_door", "minecraft:big_dripleaf_stem", "minecraft:waterlily", "minecraft:cake", "minecraft:nether_portal", "minecraft:tall_seagrass", "animania:block_trough", "animania:block_invisiblock", "colossalchests:*", "ic2:*", "bigreactors:*", "forestry:*", "tconstruct:*", "rustic:*", "botania:*", "astralsorcery:*", "quark:colored_bed_*", "immersiveengineering:*", "embers:block_furnace", "embers:ember_bore", "embers:ember_activator", "embers:mixer", "embers:heat_coil", "embers:large_tank", "embers:crystal_cell", "embers:alchemy_pedestal", "embers:boiler", "embers:combustor", "embers:catalzyer", "embers:field_chart", "embers:inferno_forge", "storagedrawers:framingtable", "skyresources:*", "lootbags:*", "exsartagine:*", "aquamunda:tank", "opencomputers:*", "malisisdoors:*", "industrialforegoing:*", "minecolonies:*", "thaumcraft:pillar*", "thaumcraft:infernal_furnace", "thaumcraft:placeholder*", "thaumcraft:infusion_matrix", "thaumcraft:golem_builder", "thaumcraft:thaumatorium*", "magneticraft:oil_heater", "magneticraft:solar_panel", "magneticraft:steam_engine", "magneticraft:shelving_unit", "magneticraft:grinder", "magneticraft:sieve", "magneticraft:solar_tower", "magneticraft:solar_mirror", "magneticraft:container", "magneticraft:pumpjack", "magneticraft:solar_panel", "magneticraft:refinery", "magneticraft:oil_heater", "magneticraft:hydraulic_press", "magneticraft:multiblock_gap", "refinedstorage:*", "mcmultipart:*", "enderstorage:*", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*", "forgemultipartcbe:*", "integrateddynamics:cable", "mekanismgenerators:wind_generator", "cookingforblockheads:cabinet", "cookingforblockheads:corner", "cookingforblockheads:counter", "cookingforblockheads:oven", "cookingforblockheads:toaster", "cookingforblockheads:milk_jar", "cookingforblockheads:cow_jar", "cookingforblockheads:fruit_basket", "cookingforblockheads:cooking_table", "cookingforblockheads:fridge", "cookingforblockheads:sink", "powah:*", "advancementtrophies:trophy", "mekanismgenerators:heat_generator", "mna:filler_block"]
#Entities that cannot be picked up
forbiddenEntities = ["minecraft:end_crystal", "minecraft:ender_dragon", "minecraft:ghast", "minecraft:shulker", "minecraft:leash_knot", "minecraft:armor_stand", "minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*", "securitycraft:*", "taterzens:npc", "easy_npc:*", "bodiesbodies:dead_body"]
#Entities that cannot have other entities stacked on top of them
Expand Down
22 changes: 0 additions & 22 deletions kubejs/assets/ptdye/blockstates/animation_block.json

This file was deleted.

5 changes: 0 additions & 5 deletions kubejs/assets/ptdye/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,9 @@
"item.ptdye.ponder_automaton.tooltip.summary": "Ponder to learn about Automaton",
"item.ptdye.hammer": "Hammer",
"item.ptdye.hammer.tooltip.summary": "Turns blocks back into device parts quickly!",
"item.ptdye.animation_anchor": "Animation Anchor",
"item.ptdye.animation_anchor_set": "Animation Anchor [%s]",
"item.ptdye.animation_anchor.desc": "Used to set the anchor of an animated structure",

"block.ptdye.grayFence": "Gray Fence",
"block.ptdye.block.ptdye.grayFenceGate": "Gray Fence Gate",
"block.ptdye.animation_block": "Animation Block",
"block.ptdye.animation_block.tooltip": "Place next to glued structure",

"status.ptdye.trading_platform.blocked": "Cannot land in the selected spot - The way is blocked",
"status.ptdye.trading_platform.platform_nearby": "USCUPP® terms and services do not allow trading platforms this close to each other",
Expand Down
6 changes: 0 additions & 6 deletions kubejs/assets/ptdye/models/block/animation_block.json

This file was deleted.

27 changes: 0 additions & 27 deletions kubejs/assets/ptdye/models/block/animation_block_directional.json

This file was deleted.

6 changes: 0 additions & 6 deletions kubejs/assets/ptdye/models/item/animation_anchor.json

This file was deleted.

6 changes: 0 additions & 6 deletions kubejs/assets/ptdye/models/item/animation_anchor_set.json

This file was deleted.

Binary file removed kubejs/assets/ptdye/textures/block/animation_block.png
Binary file not shown.
5 changes: 0 additions & 5 deletions kubejs/assets/ptdye/textures/block/animation_block.png.mcmeta

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file removed kubejs/assets/ptdye/textures/item/animation_anchor.png
Binary file not shown.
6 changes: 0 additions & 6 deletions kubejs/assets/ptdye/textures/item/animation_anchor.png.mcmeta

This file was deleted.

Binary file not shown.

This file was deleted.

15 changes: 0 additions & 15 deletions kubejs/client_scripts/animation_anchor.js

This file was deleted.

47 changes: 0 additions & 47 deletions kubejs/server_scripts/base/animation/animation_anchor.js

This file was deleted.

185 changes: 0 additions & 185 deletions kubejs/server_scripts/base/animation/animation_block.js

This file was deleted.

Loading

0 comments on commit a26062a

Please sign in to comment.