diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65cf05b60..175667515 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -257,8 +257,9 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: dev target_branch: main - reviewer: Xikaro + milestone: ${{ steps.changelog.outputs.version }} ignore_users: "dependabot" + draft: true title: 'Release: ${{ steps.changelog.outputs.version }}' body: | **This is an automated Pull Request from the dev branch.** diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d971a15e..2db55f846 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ ### Changes ### Bug fixes +## [0.10.9] - 10-08-2025 +### Changes +- Heavily reduced how much power the electric refrigerators use @Pyritie +- Prevented the ad astra rockets from exploding, due to being unreliable on high latency servers @Pyritie +### Bug fixes +- Fixed kubejs errors on Linux machines. @Pyritie +- Fixed recipe conflict with conductor whistle and clockwork sniper. @Redeix +- Fixed the patchouli page explaining tfc alloys to use the new alloy ratios @Pyritie + ## [0.10.8] - 10-08-2025 ### Changes - FTBQuests has been changed back to linear mode, hopefully to prevent future cases where the quests get stuck on something. Please send us feedback! (#1568) @TomPlop diff --git a/config/everycomp-common.toml b/config/everycomp-common.toml index 17f94e37c..448eaa2a1 100644 --- a/config/everycomp-common.toml +++ b/config/everycomp-common.toml @@ -12,6 +12,8 @@ debug_packet = false #Enables the generation of dynamic assets. This is required for the mod to work properly. Turn off if you chose to add all the generated assets via datapack manually. This can speedup boot times for modpacks. Note that the generated assets will depend on loaded datapacks generate_dynamic_assets = true + #Allow the item_search or searchBar to be visible. + tab_item_search = true [general.tooltips] #Enabled tooltips showing which mod an EC item is from diff --git a/config/everycomp-hazardous.toml b/config/everycomp-hazardous.toml new file mode 100644 index 000000000..3764b8de9 --- /dev/null +++ b/config/everycomp-hazardous.toml @@ -0,0 +1,52 @@ + +# ═════════════════════════ Attention ═════════════════════════ +# Don't use this if you don't know what you are doing +# REASON: +# This file is a conditional registration. This is harmless in Singleplayer World, +# but harmful in SERVER because you won't able to join. +# +# ══════════════════════════ Detail ═══════════════════════════ +# This file allow you to exclude WoodTypes, LeavesType, EntrySet, or a Module +# 1) You can find their names for WoodTypes, LeavesType, or EntrySet in `everycomp-entries.toml` +# 2) Leave a value empty to disable that rule. +# +# Module - is a Supported Mod, just a modId is sufficient. +# EntrySet - is a FurnitureType or DecorativeType that Wood-Good is supporting via the mod. it is either block or item. +# +# NOTE: blacklisting a Module will be applied to Wood-Good, Stone-Zone, Gems-Realm +# +[woodtype] + #Exclude WoodType from all of Modules + # EXAMPLE: blacklist = [ + # "forestry:.*fireproof.*", COMMENT: .* is an RegEx, it exclude all of WoodType containing "fireproof" from Forestry + # "biomesoplenty:.*", COMMENT: .* is an RegEx, it exclude all of WoodType from Wood Mod for any Module + # "biomesoplenty:redwood" COMMENT: exclude redwood from Wood Mod for any module + # ] + # + blacklist = [] + +[leavestype] + #Exclude LeavesType from all of Modules + # The example is same as WoodType's + blacklist = [] + +[entryset] + #Exclude EntrySet from the module for All of WoodType or LeavesType + # This is only applied to Wood-Good. + # EXAMPLE: blacklist = [ + # "chipped:checkered_trapdoor", COMMENT: chipped:checkered_oak_trapdoor without "oak" + # "variantvanillablocks:chest", COMMENT: variantvanillablocks:oak_chest without "oak" + # "chipped:.*" COMMENT: .* is an regex which will exclude all of EntrySets from one Module - Wood-Good ONLY + # ] + # + blacklist = [] + +[module] + #Exclude Module From Wood-Good, Stone-Zone & Gems-Realm + # EXAMPLE: blacklist = [ + # "chipped", + # "variantvanillablocks" + # ] + # + blacklist = [] + diff --git a/config/fancymenu/options.txt b/config/fancymenu/options.txt index 3491509d6..317a601e3 100644 --- a/config/fancymenu/options.txt +++ b/config/fancymenu/options.txt @@ -53,6 +53,7 @@ F:layout_editor_grid_snapping_strength = '1.0'; S:anchor_overlay_color_base_override = ''; I:layout_editor_grid_size = '10'; B:invert_anchor_overlay_color = 'false'; +B:enable_buddy = 'true'; S:anchor_overlay_color_border_override = ''; F:anchor_overlay_opacity_normal = '0.5'; F:anchor_overlay_opacity_busy = '0.7'; diff --git a/config/fpsreducer/fpsreducer-client.toml b/config/fpsreducer/fpsreducer-client.toml index 37ab1afb7..ce3449829 100644 --- a/config/fpsreducer/fpsreducer-client.toml +++ b/config/fpsreducer/fpsreducer-client.toml @@ -10,7 +10,7 @@ #Range: 1 ~ 60 idleFps = 10 #Max frame rate during GUI screen(Inventory/Menu) is opened. (0:OFF) - #Range: 0 ~ 60 + #Range: 0 ~ 260 guiScreenFps = 0 #Max frame rate when the character is stationary. (0:OFF) #Range: 0 ~ 260 diff --git a/config/ftbquests/quests/chapters/gregtech_energy.snbt b/config/ftbquests/quests/chapters/gregtech_energy.snbt index 6122cd3d9..226eb6c38 100644 --- a/config/ftbquests/quests/chapters/gregtech_energy.snbt +++ b/config/ftbquests/quests/chapters/gregtech_energy.snbt @@ -804,7 +804,7 @@ y: -3.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:lv_universal_circuit" id: "4C620105AAC49381" @@ -821,7 +821,7 @@ y: -7.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:mv_universal_circuit" id: "0AF286AA540A82E6" @@ -838,7 +838,7 @@ y: -5.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:hv_universal_circuit" id: "4D0ADC66D2CF09B1" @@ -855,7 +855,7 @@ y: -3.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:ev_universal_circuit" id: "7AF726555D721DFC" @@ -872,7 +872,7 @@ y: -1.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:iv_universal_circuit" id: "05E2F203DA46A5E8" @@ -889,7 +889,7 @@ y: 1.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:luv_universal_circuit" id: "1DB543EFEEB67238" @@ -906,7 +906,7 @@ y: 3.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:zpm_universal_circuit" id: "39019EF278D09DF7" @@ -923,7 +923,7 @@ y: 5.0d } { - description: ["{quests.ore_proc.lv_tier.desc}"] + description: ["TODO"] disable_toast: true icon: "tfg:uv_universal_circuit" id: "7ECA77DFEE2F6F20" diff --git a/config/ftbquests/quests/chapters/space_survival.snbt b/config/ftbquests/quests/chapters/space_survival.snbt index 1765db9e1..28c948ed4 100644 --- a/config/ftbquests/quests/chapters/space_survival.snbt +++ b/config/ftbquests/quests/chapters/space_survival.snbt @@ -608,6 +608,7 @@ "{@pagebreak}" "{quests.space_survival.ammo_railgun.desc.2}" ] + icon: "tfg:railgun_ammo_shell" id: "3BEEB11C8621772D" subtitle: "{quests.space_survival.ammo_railgun.subtitle}" tasks: [ diff --git a/config/greate-recipes.yaml b/config/greate-recipes.yaml new file mode 100644 index 000000000..11306f37a --- /dev/null +++ b/config/greate-recipes.yaml @@ -0,0 +1,7 @@ +# Enable/Disable wire coating recipes in the crafting grid/packer/assembler. +# If disabled, wire coating recipes will only be accessible via the spout & wire coating factory. +enableGTWireCoatingRecipes: true + +# Enable/Disable harder recipes for various Create blocks & items. +enableHardCreateRecipes: false + diff --git a/config/gtceu.yaml b/config/gtceu.yaml index 95ddfbfbf..2e7586643 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -9,7 +9,7 @@ recipes: disableManualCompression: true # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods. - # Default: false + # Default: true harderRods: false # Whether to make crafting recipes for Bricks, Firebricks, Nether Bricks, and Coke Bricks harder. @@ -50,7 +50,7 @@ recipes: nerfPaperCrafting: true # Recipes for items like Iron Doors, Trapdoors, Anvil require Iron Plates, Rods, and more. - # Default: false + # Default: true hardAdvancedIronRecipes: true # Whether to make coloring blocks like Concrete or Glass harder. @@ -86,7 +86,7 @@ recipes: hardMultiRecipes: false # Whether tools should have enchants or not. Like the flint sword getting fire aspect. - # Default: true + # Default: false enchantedTools: false worldgen: @@ -153,14 +153,8 @@ worldgen: oreIndicatorChunkCacheSize: 2048 machines: - # Whether insufficient energy supply should reset Machine recipe progress to zero. - # If true, progress will reset. - # If false, progress will decrease to zero with 2x speed - # Default: false - recipeProgressLowEnergy: false - # Whether to require a Wrench, Wirecutter, or other GregTech tools to break machines, casings, wires, and more. - # Default: false + # Default: true requireGTToolsForBlocks: true # Whether machines explode in rainy weather or when placed next to certain terrain, such as fire or lava @@ -188,6 +182,10 @@ machines: # Default: true machineSounds: true + # Duration in ticks that batching will try to reach. + # Default: 100 + batchDuration: 100 + # Whether Steam Multiblocks should use Steel instead of Bronze. # Default: false steelSteamMultiblocks: true @@ -213,6 +211,10 @@ machines: # Default: true enableMaintenance: true + # Time in ticks between when Multiblocks can require Maintenance. By default, 48 hours. + # Default: 3456000 + maintenanceTime: 3456000 + # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true enableWorldAccelerators: false @@ -279,7 +281,7 @@ machines: # Whether the Assembly Line should require the fluid inputs to be in order. # (Requires Ordered Assembly Line Item Inputs to be enabled.) - # Default: false + # Default: true orderedAssemblyLineFluids: false # Default maximum parallel of steam multiblocks @@ -355,6 +357,11 @@ client: # Default: true machinesEmissiveTextures: true + # Whether most machines will have block entity renderers, mainly used for rendering certain covers. (Restart required) + # Disable if experiencing performance issues. + # Default: true + machinesHaveBERsByDefault: true + # Whether or not sounds should be played when using tools outside of crafting. # Default: true toolUseSounds: true @@ -369,8 +376,8 @@ client: defaultPaintingColor: #FFFFFF # The default color to overlay onto Machine (and other) UIs. - # 16777215 (#FFFFFF) is no coloring (like GTCE) (default). - # 13819135 (#D2DCFF in decimal) is the classic blue from GT5. + # #FFFFFF is no coloring (like GTCE) (default). + # #D2DCFF is the classic blue from GT5. defaultUIColor: #FFFFFF # Use VBO cache for multiblock preview. @@ -408,6 +415,14 @@ client: # Default: true renderFluids: true + # Whether or not to color tiered machine highlights in the tier color + # Default: true + coloredTieredMachineOutline: true + + # Whether or not to color wire/cable highlights based on voltage tier + # Default: true + coloredWireOutline: true + # Config options for Tools and Armor tools: # Random chance for electric tools to take actual damage @@ -478,7 +493,7 @@ gameplay: universalHazards: true # Whether environmental hazards like pollution or radiation are active - # Default: true + # Default: false environmentalHazards: false # How much environmental hazards decay per chunk, per tick. @@ -516,7 +531,7 @@ compat: updateIntervals: 40 # The energy consumption of ME Hatch/Bus. - # Default: 1.0AE/t + # Default: 4.0AE/t meHatchEnergyUsage: 1.0 # Config options regarding GTCEu compatibility with minimap mods @@ -560,7 +575,7 @@ compat: buttonAnchor: BOTTOM_LEFT # Which direction the buttons will go - # Default: "HORIZONTAL" + # Default: "VERTICAL" direction: HORIZONTAL # How horizontally far away from the anchor to place the buttons @@ -571,10 +586,6 @@ compat: # Default: 0 yOffset: 0 - # Whether to put buttons on a separate toolbar on the right instead of the map type toolbar in JourneyMap. - # Default: true - rightToolbar: true - # Whether to hide facades of all blocks in JEI and creative search menu. # Default: true hideFacadesInRecipeViewer: true diff --git a/config/immersive_optimization.json b/config/immersive_optimization.json index 43de5e3a7..5e78e4cd4 100644 --- a/config/immersive_optimization.json +++ b/config/immersive_optimization.json @@ -25,7 +25,7 @@ "minecraft:arrow": false, "create": false, "minecraft:ender_dragon": false, - "sandworm_mod": false + "sandworm_mod": false }, "version": 2, "name": "immersive_optimization" diff --git a/config/jade/plugins.json b/config/jade/plugins.json index ccc7176e3..0614f8d50 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -72,6 +72,7 @@ "auto_output_info": true, "workable_provider": true, "transformer": true, + "energy_converter_provider": true, "controllable_provider": true, "me_pattern_buffer": true, "exhaust_vent_info": true, diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 3ae20eece..13564e7a0 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -70,6 +70,7 @@ "gtceu:custom_fluid_storage": null, "gtceu:custom_item_storage": null, "gtceu:electric_container_provider": null, + "gtceu:energy_converter_provider": null, "gtceu:exhaust_vent_info": null, "gtceu:fluid_storage": null, "gtceu:hazard_cleaner_provider": null, diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 639058729..167200cc8 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -133,3 +133,4 @@ tacz:gun_smith_table/tacz_attachment_workbench tacz:gun_smith_table/tacz_gun_smith_table taczammoquery:ammo_query tfclunchbox:fill_capsule +tacz:gun_smith_table/create_armorer_create_workbench diff --git a/config/sodiumdynamiclights-client.toml b/config/sodiumdynamiclights-client.toml index 64be37808..9d6bd7783 100644 --- a/config/sodiumdynamiclights-client.toml +++ b/config/sodiumdynamiclights-client.toml @@ -4,7 +4,7 @@ #Allowed Values: OFF, SLOW, FAST, REALTIME mode = "REALTIME" #Enable entities light source. - entities = false + entities = true #Enable first-person player light source. self = true #Enable block entities light source. diff --git a/kubejs/assets/betterend/blockstates/amber_root_dead.json b/kubejs/assets/betterend/blockstates/amber_root_dead.json new file mode 100644 index 000000000..0f6ff5d98 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/amber_root_dead.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/amber_root_dead_0" }, + { "model": "betterend:block/amber_root_dead_1" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/amber_root_wild.json b/kubejs/assets/betterend/blockstates/amber_root_wild.json index dd8b16788..5ca7bf2b0 100644 --- a/kubejs/assets/betterend/blockstates/amber_root_wild.json +++ b/kubejs/assets/betterend/blockstates/amber_root_wild.json @@ -1,8 +1,6 @@ { "variants": { - "": [ - { "model": "betterend:block/amber_root_6" }, - { "model": "betterend:block/amber_root_7" } - ] + "mature=true": { "model": "betterend:block/amber_root_wild_mature" }, + "mature=false": { "model": "betterend:block/amber_root_wild_immature" } } } diff --git a/kubejs/assets/betterend/blockstates/blossom_berry_dead.json b/kubejs/assets/betterend/blockstates/blossom_berry_dead.json new file mode 100644 index 000000000..67980f3a9 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/blossom_berry_dead.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/blossom_berry_dead", "y": 0 }, + { "model": "betterend:block/blossom_berry_dead", "y": 90 }, + { "model": "betterend:block/blossom_berry_dead", "y": 180 }, + { "model": "betterend:block/blossom_berry_dead", "y": 270 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/blossom_berry_wild.json b/kubejs/assets/betterend/blockstates/blossom_berry_wild.json index f0943e016..3dfcacd12 100644 --- a/kubejs/assets/betterend/blockstates/blossom_berry_wild.json +++ b/kubejs/assets/betterend/blockstates/blossom_berry_wild.json @@ -1,5 +1,16 @@ { "variants": { - "": { "model": "betterend:block/blossom_berry" } + "mature=true": [ + { "model": "betterend:block/blossom_berry_wild_mature", "y": 0 }, + { "model": "betterend:block/blossom_berry_wild_mature", "y": 90 }, + { "model": "betterend:block/blossom_berry_wild_mature", "y": 180 }, + { "model": "betterend:block/blossom_berry_wild_mature", "y": 270 } + ], + "mature=false": [ + { "model": "betterend:block/blossom_berry_wild_immature", "y": 0 }, + { "model": "betterend:block/blossom_berry_wild_immature", "y": 90 }, + { "model": "betterend:block/blossom_berry_wild_immature", "y": 180 }, + { "model": "betterend:block/blossom_berry_wild_immature", "y": 270 } + ] } } diff --git a/kubejs/assets/betterend/blockstates/bolux_mushroom_dead.json b/kubejs/assets/betterend/blockstates/bolux_mushroom_dead.json new file mode 100644 index 000000000..0af90925c --- /dev/null +++ b/kubejs/assets/betterend/blockstates/bolux_mushroom_dead.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/bolux_mushroom_dead", "y": 0 }, + { "model": "betterend:block/bolux_mushroom_dead", "y": 90 }, + { "model": "betterend:block/bolux_mushroom_dead", "y": 180 }, + { "model": "betterend:block/bolux_mushroom_dead", "y": 270 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/bolux_mushroom_wild.json b/kubejs/assets/betterend/blockstates/bolux_mushroom_wild.json index 1e328f49c..a64662313 100644 --- a/kubejs/assets/betterend/blockstates/bolux_mushroom_wild.json +++ b/kubejs/assets/betterend/blockstates/bolux_mushroom_wild.json @@ -1,21 +1,16 @@ { "variants": { - "": [ - { - "model": "betterend:block/bolux_mushroom_3" - }, - { - "model": "betterend:block/bolux_mushroom_3", - "y": 90 - }, - { - "model": "betterend:block/bolux_mushroom_3", - "y": 180 - }, - { - "model": "betterend:block/bolux_mushroom_3", - "y": 270 - } + "mature=true": [ + { "model": "betterend:block/bolux_mushroom_wild_mature", "y": 0 }, + { "model": "betterend:block/bolux_mushroom_wild_mature", "y": 90 }, + { "model": "betterend:block/bolux_mushroom_wild_mature", "y": 180 }, + { "model": "betterend:block/bolux_mushroom_wild_mature", "y": 270 } + ], + "mature=false": [ + { "model": "betterend:block/bolux_mushroom_wild_immature", "y": 0 }, + { "model": "betterend:block/bolux_mushroom_wild_immature", "y": 90 }, + { "model": "betterend:block/bolux_mushroom_wild_immature", "y": 180 }, + { "model": "betterend:block/bolux_mushroom_wild_immature", "y": 270 } ] } } diff --git a/kubejs/assets/betterend/blockstates/cave_pumpkin_plant_dead.json b/kubejs/assets/betterend/blockstates/cave_pumpkin_plant_dead.json new file mode 100644 index 000000000..b3c788d3d --- /dev/null +++ b/kubejs/assets/betterend/blockstates/cave_pumpkin_plant_dead.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "betterend:block/cave_pumpkin_dead" } + } +} diff --git a/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json b/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json new file mode 100644 index 000000000..aa952f482 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/cave_pumpkin_wild.json @@ -0,0 +1,99 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "multipart": [ + { + "when": { + "mature": true + }, + "apply": { + "model": "betterend:block/cave_pumpkin_wild" + } + }, + { + "when": { + "mature": false + }, + "apply": { + "model": "betterend:block/cave_pumpkin_dead" + } + }, + { + "when": { + "east": true, + "mature": true + }, + "apply": { + "model": "betterend:block/cave_pumpkin_wild_side", + "y": 90 + } + }, + { + "when": { + "north": true, + "mature": true + }, + "apply": { + "model": "betterend:block/cave_pumpkin_wild_side" + } + }, + { + "when": { + "south": true, + "mature": true + }, + "apply": { + "model": "betterend:block/cave_pumpkin_wild_side", + "y": 180 + } + }, + { + "when": { + "west": true, + "mature": true + }, + "apply": { + "model": "betterend:block/cave_pumpkin_wild_side", + "y": 270 + } + }, + { + "when": { + "east": true, + "mature": false + }, + "apply": { + "model": "betterend:block/cave_pumpkin_dead_side", + "y": 90 + } + }, + { + "when": { + "north": true, + "mature": false + }, + "apply": { + "model": "betterend:block/cave_pumpkin_dead_side" + } + }, + { + "when": { + "south": true, + "mature": false + }, + "apply": { + "model": "betterend:block/cave_pumpkin_dead_side", + "y": 180 + } + }, + { + "when": { + "west": true, + "mature": false + }, + "apply": { + "model": "betterend:block/cave_pumpkin_dead_side", + "y": 270 + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/blockstates/chorus_mushroom_dead.json b/kubejs/assets/betterend/blockstates/chorus_mushroom_dead.json new file mode 100644 index 000000000..811ed28ad --- /dev/null +++ b/kubejs/assets/betterend/blockstates/chorus_mushroom_dead.json @@ -0,0 +1,8 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/chorus_mushroom_dead_0" }, + { "model": "betterend:block/chorus_mushroom_dead_1" } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/chorus_mushroom_wild.json b/kubejs/assets/betterend/blockstates/chorus_mushroom_wild.json index 1ea584c90..450fd9b07 100644 --- a/kubejs/assets/betterend/blockstates/chorus_mushroom_wild.json +++ b/kubejs/assets/betterend/blockstates/chorus_mushroom_wild.json @@ -1,8 +1,6 @@ { "variants": { - "": [ - { "model": "betterend:block/chorus_mushroom_6" }, - { "model": "betterend:block/chorus_mushroom_7" } - ] + "mature=true": { "model": "betterend:block/chorus_mushroom_wild_mature" }, + "mature=false": { "model": "betterend:block/chorus_mushroom_wild_immature" } } } diff --git a/kubejs/assets/betterend/blockstates/shadow_berry_dead.json b/kubejs/assets/betterend/blockstates/shadow_berry_dead.json new file mode 100644 index 000000000..95630b093 --- /dev/null +++ b/kubejs/assets/betterend/blockstates/shadow_berry_dead.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/shadow_berry_dead", "y": 0 }, + { "model": "betterend:block/shadow_berry_dead", "y": 90 }, + { "model": "betterend:block/shadow_berry_dead", "y": 180 }, + { "model": "betterend:block/shadow_berry_dead", "y": 270 } + ] + } +} diff --git a/kubejs/assets/betterend/blockstates/shadow_berry_wild.json b/kubejs/assets/betterend/blockstates/shadow_berry_wild.json new file mode 100644 index 000000000..cbfdf45ce --- /dev/null +++ b/kubejs/assets/betterend/blockstates/shadow_berry_wild.json @@ -0,0 +1,16 @@ +{ + "variants": { + "mature=true": [ + { "model": "betterend:block/shadow_berry_wild_mature", "y": 0 }, + { "model": "betterend:block/shadow_berry_wild_mature", "y": 90 }, + { "model": "betterend:block/shadow_berry_wild_mature", "y": 180 }, + { "model": "betterend:block/shadow_berry_wild_mature", "y": 270 } + ], + "mature=false": [ + { "model": "betterend:block/shadow_berry_wild_immature", "y": 0 }, + { "model": "betterend:block/shadow_berry_wild_immature", "y": 90 }, + { "model": "betterend:block/shadow_berry_wild_immature", "y": 180 }, + { "model": "betterend:block/shadow_berry_wild_immature", "y": 270 } + ] + } +} diff --git a/kubejs/assets/betterend/models/block/amber_root_dead_0.json b/kubejs/assets/betterend/models/block/amber_root_dead_0.json new file mode 100644 index 000000000..feef5e18b --- /dev/null +++ b/kubejs/assets/betterend/models/block/amber_root_dead_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/amber_root_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/amber_root_dead_1.json b/kubejs/assets/betterend/models/block/amber_root_dead_1.json new file mode 100644 index 000000000..09252bcd7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/amber_root_dead_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/amber_root_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/amber_root_wild_immature.json b/kubejs/assets/betterend/models/block/amber_root_wild_immature.json new file mode 100644 index 000000000..d25cc6455 --- /dev/null +++ b/kubejs/assets/betterend/models/block/amber_root_wild_immature.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/crop_wild", + "textures": { + "crop": "betterend:block/amber_root_dead", + "particle": "betterend:block/amber_root_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/amber_root_wild_mature.json b/kubejs/assets/betterend/models/block/amber_root_wild_mature.json new file mode 100644 index 000000000..3332918ae --- /dev/null +++ b/kubejs/assets/betterend/models/block/amber_root_wild_mature.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/crop_wild", + "textures": { + "crop": "betterend:block/amber_root_3", + "particle": "betterend:block/amber_root_3" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/blossom_berry_dead.json b/kubejs/assets/betterend/models/block/blossom_berry_dead.json new file mode 100644 index 000000000..3f0d5edae --- /dev/null +++ b/kubejs/assets/betterend/models/block/blossom_berry_dead.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross", + "textures": { + "cross": "betterend:block/blossom_berry_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/blossom_berry_seed_0.json b/kubejs/assets/betterend/models/block/blossom_berry_seed_0.json index 874f5b0db..fbb1b8de9 100644 --- a/kubejs/assets/betterend/models/block/blossom_berry_seed_0.json +++ b/kubejs/assets/betterend/models/block/blossom_berry_seed_0.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "betterend:block/cross", "textures": { "cross": "betterend:block/blossom_berry_seed_0" } diff --git a/kubejs/assets/betterend/models/block/blossom_berry_seed_1.json b/kubejs/assets/betterend/models/block/blossom_berry_seed_1.json index 0796b43bd..600323dc6 100644 --- a/kubejs/assets/betterend/models/block/blossom_berry_seed_1.json +++ b/kubejs/assets/betterend/models/block/blossom_berry_seed_1.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "betterend:block/cross", "textures": { "cross": "betterend:block/blossom_berry_seed_1" } diff --git a/kubejs/assets/betterend/models/block/blossom_berry_seed_2.json b/kubejs/assets/betterend/models/block/blossom_berry_seed_2.json index 09bf8cf4b..e01fedd98 100644 --- a/kubejs/assets/betterend/models/block/blossom_berry_seed_2.json +++ b/kubejs/assets/betterend/models/block/blossom_berry_seed_2.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cross", + "parent": "betterend:block/cross", "textures": { "cross": "betterend:block/blossom_berry_seed_2" } diff --git a/kubejs/assets/betterend/models/block/blossom_berry_wild_immature.json b/kubejs/assets/betterend/models/block/blossom_berry_wild_immature.json new file mode 100644 index 000000000..5b5596642 --- /dev/null +++ b/kubejs/assets/betterend/models/block/blossom_berry_wild_immature.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/crop_wild", + "textures": { + "crop": "betterend:block/blossom_berry_dead", + "particle": "betterend:block/blossom_berry_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json b/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json new file mode 100644 index 000000000..b93d8294d --- /dev/null +++ b/kubejs/assets/betterend/models/block/blossom_berry_wild_mature.json @@ -0,0 +1,81 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "1": "betterend:block/wild_crop", + "particle": "betterend:block/blossom_berry_flower", + "stem": "betterend:block/blossom_berry_stem", + "flower": "betterend:block/blossom_berry_flower", + "texture": "betterend:block/blossom_berry_fruit" + }, + "elements": [ + { + "__comment": "PlaneX1", + "from": [ 2.25, 0, 2.25 ], + "to": [ 2.251, 16, 18.25 ], + "rotation": { "origin": [ 2.25, 0, 2.25 ], "axis": "y", "angle": 45 }, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" } + } + }, + { + "__comment": "PlaneX1", + "from": [ 13.75, 0, 2.25 ], + "to": [ 13.751, 16, 18.25 ], + "rotation": { "origin": [ 13.75, 0, 2.25 ], "axis": "y", "angle": -45 }, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" } + } + }, + { + "__comment": "PlaneY3", + "from": [ 0, 12, 0 ], + "to": [ 16, 12.001, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#flower" } + } + }, + { + "__comment": "Box4", + "from": [ 5, 11, 5 ], + "to": [ 11, 17, 11 ], + "faces": { + "down": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture" }, + "north": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture" } + } + }, + { + "from": [13.1, -1, 0.1], + "to": [13.1, 15, 16.1], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 3.1], + "to": [16.1, 15, 3.1], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 13.1], + "to": [16.1, 15, 13.1], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_0.json b/kubejs/assets/betterend/models/block/bolux_mushroom_0.json index 87762ba41..ea16a2132 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_0.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_0.json @@ -7,7 +7,7 @@ "elements": [ { "__comment": "Box1", - "from": [ 6, 0, 8 ], + "from": [ 6, -1, 8 ], "to": [ 8, 2, 10 ], "faces": { "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_1.json b/kubejs/assets/betterend/models/block/bolux_mushroom_1.json index 4c80d9183..f18309b79 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_1.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_1.json @@ -32,7 +32,7 @@ }, { "__comment": "Box1", - "from": [ 4, 0, 4 ], + "from": [ 4, -1, 4 ], "to": [ 6, 3, 6 ], "faces": { "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, @@ -43,7 +43,7 @@ }, { "__comment": "Box1", - "from": [ 10, 0, 12 ], + "from": [ 10, -1, 12 ], "to": [ 12, 2, 14 ], "faces": { "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_2.json b/kubejs/assets/betterend/models/block/bolux_mushroom_2.json index e8b854979..0e77ecb36 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_2.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_2.json @@ -7,7 +7,7 @@ "elements": [ { "__comment": "Box1", - "from": [ 11, 0, 4 ], + "from": [ 11, -1, 4 ], "to": [ 13, 2, 6 ], "faces": { "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, @@ -43,7 +43,7 @@ }, { "__comment": "Box1", - "from": [ 3, 0, 6 ], + "from": [ 3, -1, 6 ], "to": [ 5, 3, 8 ], "faces": { "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, @@ -79,7 +79,7 @@ }, { "__comment": "Box1", - "from": [ 10, 0, 12 ], + "from": [ 10, -1, 12 ], "to": [ 12, 2, 14 ], "faces": { "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_3.json b/kubejs/assets/betterend/models/block/bolux_mushroom_3.json index f11b78b71..cdd066790 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_3.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_3.json @@ -32,7 +32,7 @@ }, { "__comment": "Box1", - "from": [ 10, 0, 9 ], + "from": [ 10, -1, 9 ], "to": [ 12, 3, 11 ], "faces": { "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, @@ -43,7 +43,7 @@ }, { "__comment": "Box1", - "from": [ 2, 0, 5 ], + "from": [ 2, -1, 5 ], "to": [ 4, 3, 7 ], "faces": { "north": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, @@ -79,7 +79,7 @@ }, { "__comment": "Box1", - "from": [ 9, 0, 2 ], + "from": [ 9, -1, 2 ], "to": [ 11, 4, 4 ], "faces": { "north": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, @@ -127,7 +127,7 @@ }, { "__comment": "Box1", - "from": [ 2, 0, 12 ], + "from": [ 2, -1, 12 ], "to": [ 4, 2, 14 ], "faces": { "north": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_dead.json b/kubejs/assets/betterend/models/block/bolux_mushroom_dead.json new file mode 100644 index 000000000..a5fe01597 --- /dev/null +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_dead.json @@ -0,0 +1,81 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bolux_mushroom_dead", + "texture": "betterend:block/bolux_mushroom_dead" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 3, 1 ], + "to": [ 9, 7, 9 ], + "faces": { + "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 7, 2 ], + "to": [ 8, 8, 8 ], + "faces": { + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, -1, 4 ], + "to": [ 6, 3, 6 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, -1, 12 ], + "to": [ 12, 2, 14 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 2, 10 ], + "to": [ 14, 5, 16 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 5, 11 ], + "to": [ 13, 6, 15 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json new file mode 100644 index 000000000..6b5490338 --- /dev/null +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_immature.json @@ -0,0 +1,118 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "1": "betterend:block/wild_crop", + "particle": "betterend:block/bolux_mushroom_dead", + "texture": "betterend:block/bolux_mushroom_dead" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 3, 1 ], + "to": [ 9, 7, 9 ], + "faces": { + "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 7, 2 ], + "to": [ 8, 8, 8 ], + "faces": { + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, -1, 4 ], + "to": [ 6, 3, 6 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, -1, 12 ], + "to": [ 12, 2, 14 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 2, 10 ], + "to": [ 14, 5, 16 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 5, 11 ], + "to": [ 13, 6, 15 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture", "rotation": 90 }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + }, + { + "from": [3, -1, 0], + "to": [3, 15, 16], + "shade": false, + "faces": { + "east": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [13, -1, 0], + "to": [13, 15, 16], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0, -1, 3], + "to": [16, 15, 3], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0, -1, 13], + "to": [16, 15, 13], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json new file mode 100644 index 000000000..22987b28f --- /dev/null +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_wild_mature.json @@ -0,0 +1,190 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "1": "betterend:block/wild_crop", + "particle": "betterend:block/bolux_mushroom", + "texture": "betterend:block/bolux_mushroom" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 7, 3, 6 ], + "to": [ 15, 7, 14 ], + "faces": { + "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, + "north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 7, 7 ], + "to": [ 14, 8, 13 ], + "faces": { + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, + "east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, -1, 9 ], + "to": [ 12, 3, 11 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }, + "east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, -1, 5 ], + "to": [ 4, 3, 7 ], + "faces": { + "north": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, + "south": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, + "west": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" }, + "east": { "uv": [ 1, 0, 3, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 3, 3 ], + "to": [ 6, 6, 9 ], + "faces": { + "down": { "uv": [ 1, 9, 7, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, + "north": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 13, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 6, 4 ], + "to": [ 5, 7, 8 ], + "faces": { + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, -1, 2 ], + "to": [ 11, 4, 4 ], + "faces": { + "north": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 4 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 8, 4, 1 ], + "to": [ 12, 9, 5 ], + "faces": { + "down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" }, + "up": { "uv": [ 10, 2, 14, 6 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 14, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 9, 2 ], + "to": [ 11, 10, 4 ], + "faces": { + "up": { "uv": [ 11, 3, 13, 5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" }, + "south": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" }, + "west": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" }, + "east": { "uv": [ 11, 10, 13, 11 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 5, 12 ], + "to": [ 4, 6, 14 ], + "faces": { + "up": { "uv": [ 11, 3, 13, 5 ], "texture": "#texture" }, + "north": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" }, + "south": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" }, + "west": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" }, + "east": { "uv": [ 11, 11, 13, 12 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, -1, 12 ], + "to": [ 4, 2, 14 ], + "faces": { + "north": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, + "south": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, + "west": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" }, + "east": { "uv": [ 0, 1, 2, 3 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 2, 11 ], + "to": [ 5, 5, 15 ], + "faces": { + "down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" }, + "west": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 13, 14, 16 ], "texture": "#texture" } + } + }, + { + "from": [3.1, -1, 0.1], + "to": [3.1, 15, 16.1], + "shade": false, + "faces": { + "east": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [13.1, -1, 0.1], + "to": [13.1, 15, 16.1], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 3.1], + "to": [16.1, 15, 3.1], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 13.1], + "to": [16.1, 15, 13.1], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin.json b/kubejs/assets/betterend/models/block/cave_pumpkin.json index 2b563ab3f..a37a47661 100644 --- a/kubejs/assets/betterend/models/block/cave_pumpkin.json +++ b/kubejs/assets/betterend/models/block/cave_pumpkin.json @@ -33,7 +33,7 @@ { "__comment": "PlaneX3", "from": [ 0, 10, 0 ], - "to": [ 0.001, 15, 16 ], + "to": [ 0, 15, 16 ], "faces": { "west": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" }, "east": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" } @@ -42,7 +42,7 @@ { "__comment": "PlaneX3", "from": [ 16, 10, 0 ], - "to": [ 16.001, 15, 16 ], + "to": [ 16, 15, 16 ], "faces": { "west": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" }, "east": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" } @@ -51,7 +51,7 @@ { "__comment": "PlaneZ5", "from": [ 0, 10, 16 ], - "to": [ 16, 15, 16.001 ], + "to": [ 16, 15, 16 ], "faces": { "north": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" }, "south": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" } @@ -60,7 +60,7 @@ { "__comment": "PlaneZ5", "from": [ 0, 10, 0 ], - "to": [ 16, 15, 0.001 ], + "to": [ 16, 15, 0 ], "faces": { "north": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" }, "south": { "uv": [ 0, 1, 16, 6 ], "texture": "#side" } diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin_dead.json b/kubejs/assets/betterend/models/block/cave_pumpkin_dead.json new file mode 100644 index 000000000..1bdb52e25 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_pumpkin_dead.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross", + "textures": { + "cross": "betterend:block/cave_pumpkin_stem_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin_dead_side.json b/kubejs/assets/betterend/models/block/cave_pumpkin_dead_side.json new file mode 100644 index 000000000..3393fd775 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_pumpkin_dead_side.json @@ -0,0 +1,48 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "betterend:block/cave_pumpkin_stem_dead", + "crop": "betterend:block/cave_pumpkin_stem_dead" + }, + "elements": [ + { + "from": [ 7, 0, 0 ], + "to": [ 7, 16, 16 ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ 8, 0, 9 ] + }, + "faces": { + "east": { + "uv": [ 16, 0, 0, 16 ], + "texture": "#crop" + }, + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#crop" + } + } + }, + { + "from": [ 10, 0, 0 ], + "to": [ 10, 16, 16 ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ 8, 0, 9 ] + }, + "faces": { + "east": { + "uv": [ 16, 0, 0, 16 ], + "texture": "#crop" + }, + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#crop" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin_wild.json b/kubejs/assets/betterend/models/block/cave_pumpkin_wild.json new file mode 100644 index 000000000..f2515f7d2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_pumpkin_wild.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/crop_wild", + "textures": { + "crop": "betterend:block/cave_pumpkin_stem_3", + "particle": "betterend:block/cave_pumpkin_stem_3" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json b/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json new file mode 100644 index 000000000..8222bb8f7 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cave_pumpkin_wild_side.json @@ -0,0 +1,48 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "textures": { + "particle": "betterend:block/cave_pumpkin_stem_3_side", + "crop": "betterend:block/cave_pumpkin_stem_3_side" + }, + "elements": [ + { + "from": [ 7, 0, 0 ], + "to": [ 7, 16, 16 ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ 8, 0, 9 ] + }, + "faces": { + "east": { + "uv": [ 16, 0, 0, 16 ], + "texture": "#crop" + }, + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#crop" + } + } + }, + { + "from": [ 10, 0, 0 ], + "to": [ 10, 16, 16 ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ 8, 0, 9 ] + }, + "faces": { + "east": { + "uv": [ 16, 0, 0, 16 ], + "texture": "#crop" + }, + "west": { + "uv": [ 0, 0, 16, 16 ], + "texture": "#crop" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/chorus_mushroom_dead_0.json b/kubejs/assets/betterend/models/block/chorus_mushroom_dead_0.json new file mode 100644 index 000000000..dd4dabae9 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_mushroom_dead_0.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/chorus_mushroom_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/chorus_mushroom_dead_1.json b/kubejs/assets/betterend/models/block/chorus_mushroom_dead_1.json new file mode 100644 index 000000000..db7c48a87 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_mushroom_dead_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/chorus_mushroom_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/chorus_mushroom_wild_immature.json b/kubejs/assets/betterend/models/block/chorus_mushroom_wild_immature.json new file mode 100644 index 000000000..eaad49a64 --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_mushroom_wild_immature.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/crop_wild", + "textures": { + "crop": "betterend:block/chorus_mushroom_dead", + "particle": "betterend:block/chorus_mushroom_dead" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/chorus_mushroom_wild_mature.json b/kubejs/assets/betterend/models/block/chorus_mushroom_wild_mature.json new file mode 100644 index 000000000..bd69e24ae --- /dev/null +++ b/kubejs/assets/betterend/models/block/chorus_mushroom_wild_mature.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/crop_wild", + "textures": { + "crop": "betterend:block/chorus_mushroom_3", + "particle": "betterend:block/chorus_mushroom_3" + } +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/crop_block.json b/kubejs/assets/betterend/models/block/crop_block.json index f71aa2a0c..16ebc556d 100644 --- a/kubejs/assets/betterend/models/block/crop_block.json +++ b/kubejs/assets/betterend/models/block/crop_block.json @@ -4,32 +4,32 @@ "particle": "#texture" }, "elements": [ - { "from": [ 4.1, 0, 0 ], - "to": [ 4.1, 16, 16 ], + { "from": [ 4.1, -1, 0 ], + "to": [ 4.1, 15, 16 ], "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } } }, - { "from": [ 11.9, 0, 0 ], - "to": [ 11.9, 16, 16 ], + { "from": [ 11.9, -1, 0 ], + "to": [ 11.9, 15, 16 ], "shade": false, "faces": { "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } } }, - { "from": [ 0, 0, 4.1 ], - "to": [ 16, 16, 4.1 ], + { "from": [ 0, -1, 4.1 ], + "to": [ 16, 15, 4.1 ], "shade": false, "faces": { "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } } }, - { "from": [ 0, 0, 11.9 ], - "to": [ 16, 16, 11.9 ], + { "from": [ 0, -1, 11.9 ], + "to": [ 16, 15, 11.9 ], "shade": false, "faces": { "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, diff --git a/kubejs/assets/betterend/models/block/crop_block_inverted.json b/kubejs/assets/betterend/models/block/crop_block_inverted.json index d08a2f6f1..35efdc33f 100644 --- a/kubejs/assets/betterend/models/block/crop_block_inverted.json +++ b/kubejs/assets/betterend/models/block/crop_block_inverted.json @@ -4,32 +4,32 @@ "particle": "#texture" }, "elements": [ - { "from": [ 4.1, 0, 0 ], - "to": [ 4.1, 16, 16 ], + { "from": [ 4.1, -1, 0 ], + "to": [ 4.1, 15, 16 ], "shade": false, "faces": { "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } } }, - { "from": [ 11.9, 0, 0 ], - "to": [ 11.9, 16, 16 ], + { "from": [ 11.9, -1, 0 ], + "to": [ 11.9, 15, 16 ], "shade": false, "faces": { "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } } }, - { "from": [ 0, 0, 4.1 ], - "to": [ 16, 16, 4.1 ], + { "from": [ 0, -1, 4.1 ], + "to": [ 16, 15, 4.1 ], "shade": false, "faces": { "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" } } }, - { "from": [ 0, 0, 11.9 ], - "to": [ 16, 16, 11.9 ], + { "from": [ 0, -1, 11.9 ], + "to": [ 16, 15, 11.9 ], "shade": false, "faces": { "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, diff --git a/kubejs/assets/betterend/models/block/crop_wild.json b/kubejs/assets/betterend/models/block/crop_wild.json new file mode 100644 index 000000000..3998707f4 --- /dev/null +++ b/kubejs/assets/betterend/models/block/crop_wild.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "parent": "block/block", + "textures": { + "1": "betterend:block/wild_crop", + "particle": "#crop", + "crop": "#crop" + }, + "elements": [ + { + "from": [4, -1, 0], + "to": [4, 15, 16], + "shade": false, + "faces": { + "east": {"uv": [16, 0, 0, 16], "texture": "#crop"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#crop"} + } + }, + { + "from": [12, -1, 0], + "to": [12, 15, 16], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#crop"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#crop"} + } + }, + { + "from": [0, -1, 4], + "to": [16, 15, 4], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#crop"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#crop"} + } + }, + { + "from": [0, -1, 12], + "to": [16, 15, 12], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#crop"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#crop"} + } + }, + { + "from": [3, -1, 0], + "to": [3, 15, 16], + "shade": false, + "faces": { + "east": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "from": [13, -1, 0], + "to": [13, 15, 16], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0, -1, 3], + "to": [16, 15, 3], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0, -1, 13], + "to": [16, 15, 13], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/cross.json b/kubejs/assets/betterend/models/block/cross.json new file mode 100644 index 000000000..37c8b09f2 --- /dev/null +++ b/kubejs/assets/betterend/models/block/cross.json @@ -0,0 +1,26 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#cross" + }, + "elements": [ + { "from": [ 0.8, 0, 8 ], + "to": [ 15.2, 16, 8 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + }, + { "from": [ 8, 0, 0.8 ], + "to": [ 8, 16, 15.2 ], + "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true }, + "shade": false, + "faces": { + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" } + } + } + ] +} diff --git a/kubejs/assets/betterend/models/block/shadow_berry_01.json b/kubejs/assets/betterend/models/block/shadow_berry_01.json index d0c273d2e..35bbe37a9 100644 --- a/kubejs/assets/betterend/models/block/shadow_berry_01.json +++ b/kubejs/assets/betterend/models/block/shadow_berry_01.json @@ -8,8 +8,8 @@ "elements": [ { "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], + "from": [ 0, -0.5, 0 ], + "to": [ 16, -0.501, 16 ], "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } diff --git a/kubejs/assets/betterend/models/block/shadow_berry_02.json b/kubejs/assets/betterend/models/block/shadow_berry_02.json index 459394e20..4162b3495 100644 --- a/kubejs/assets/betterend/models/block/shadow_berry_02.json +++ b/kubejs/assets/betterend/models/block/shadow_berry_02.json @@ -8,8 +8,8 @@ "elements": [ { "__comment": "Box1", - "from": [ 3, 0, 3 ], - "to": [ 7, 4, 7 ], + "from": [ 3, -1, 3 ], + "to": [ 7, 3, 7 ], "faces": { "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, @@ -21,8 +21,8 @@ }, { "__comment": "Box1", - "from": [ 11.5, 0, 6.5 ], - "to": [ 14.5, 3, 9.5 ], + "from": [ 11.5, -1, 6.5 ], + "to": [ 14.5, 2, 9.5 ], "faces": { "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, @@ -34,8 +34,8 @@ }, { "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], + "from": [ 0, -0.5, 0 ], + "to": [ 16, -0.501, 16 ], "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } diff --git a/kubejs/assets/betterend/models/block/shadow_berry_03.json b/kubejs/assets/betterend/models/block/shadow_berry_03.json index c20ce75d6..6d542947b 100644 --- a/kubejs/assets/betterend/models/block/shadow_berry_03.json +++ b/kubejs/assets/betterend/models/block/shadow_berry_03.json @@ -8,8 +8,8 @@ "elements": [ { "__comment": "Box1", - "from": [ 2, 0, 2 ], - "to": [ 8, 6, 8 ], + "from": [ 2, -1, 2 ], + "to": [ 8, 5, 8 ], "faces": { "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, @@ -21,8 +21,8 @@ }, { "__comment": "Box1", - "from": [ 11, 0, 6 ], - "to": [ 15, 4, 10 ], + "from": [ 11, -1, 6 ], + "to": [ 15, 3, 10 ], "faces": { "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, @@ -34,8 +34,8 @@ }, { "__comment": "Box1", - "from": [ 4, 0, 11 ], - "to": [ 7, 3, 14 ], + "from": [ 4, -1, 11 ], + "to": [ 7, 2, 14 ], "faces": { "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, @@ -47,8 +47,8 @@ }, { "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], + "from": [ 0, -0.5, 0 ], + "to": [ 16, -0.501, 16 ], "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } diff --git a/kubejs/assets/betterend/models/block/shadow_berry_04.json b/kubejs/assets/betterend/models/block/shadow_berry_04.json index b25f96190..8e841200c 100644 --- a/kubejs/assets/betterend/models/block/shadow_berry_04.json +++ b/kubejs/assets/betterend/models/block/shadow_berry_04.json @@ -8,8 +8,8 @@ "elements": [ { "__comment": "Box1", - "from": [ 1, 0, 1 ], - "to": [ 9, 8, 9 ], + "from": [ 1, -1, 1 ], + "to": [ 9, 7, 9 ], "faces": { "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, @@ -21,8 +21,8 @@ }, { "__comment": "Box1", - "from": [ 10, 0, 5 ], - "to": [ 16, 6, 11 ], + "from": [ 10, -1, 5 ], + "to": [ 16, 5, 11 ], "faces": { "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, @@ -34,8 +34,8 @@ }, { "__comment": "Box1", - "from": [ 3, 0, 10 ], - "to": [ 8, 5, 15 ], + "from": [ 3, -1, 10 ], + "to": [ 8, 4, 15 ], "faces": { "down": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture" }, "up": { "uv": [ 8, 0, 13, 5 ], "texture": "#texture" }, @@ -47,8 +47,8 @@ }, { "__comment": "PlaneY4", - "from": [ 0, 0.5, 0 ], - "to": [ 16, 0.501, 16 ], + "from": [ 0, -0.5, 0 ], + "to": [ 16, -0.501, 16 ], "faces": { "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } diff --git a/kubejs/assets/betterend/models/block/shadow_berry_dead.json b/kubejs/assets/betterend/models/block/shadow_berry_dead.json new file mode 100644 index 000000000..88a742b60 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_berry_dead.json @@ -0,0 +1,45 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/shadow_berry_dead", + "texture": "betterend:block/shadow_berry_dead", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 0, 3 ], + "to": [ 7, 4, 7 ], + "faces": { + "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, + "north": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "south": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11.5, 0, 6.5 ], + "to": [ 14.5, 3, 9.5 ], + "faces": { + "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, + "north": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "south": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "west": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "east": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json b/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json new file mode 100644 index 000000000..cdf452278 --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_berry_wild_immature.json @@ -0,0 +1,73 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "1": "betterend:block/wild_crop", + "particle": "betterend:block/shadow_berry_dead", + "texture": "betterend:block/shadow_berry_dead", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 0, 3 ], + "to": [ 7, 4, 7 ], + "faces": { + "down": { "uv": [ 10, 10, 14, 14 ], "texture": "#texture" }, + "up": { "uv": [ 8.5, 0.5, 12.5, 4.5 ], "texture": "#texture" }, + "north": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "south": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "west": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" }, + "east": { "uv": [ 2, 11, 6, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11.5, 0, 6.5 ], + "to": [ 14.5, 3, 9.5 ], + "faces": { + "down": { "uv": [ 12, 12, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 9, 1, 12, 4 ], "texture": "#texture" }, + "north": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "south": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "west": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" }, + "east": { "uv": [ 4, 11, 7, 14 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + }, + { + "from": [13.1, -1, 0.1], + "to": [13.1, 15, 16.1], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 3.1], + "to": [16.1, 15, 3.1], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 13.1], + "to": [16.1, 15, 13.1], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json b/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json new file mode 100644 index 000000000..8e52d238b --- /dev/null +++ b/kubejs/assets/betterend/models/block/shadow_berry_wild_mature.json @@ -0,0 +1,86 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "1": "betterend:block/wild_crop", + "particle": "betterend:block/shadow_berry", + "texture": "betterend:block/shadow_berry", + "texture1": "betterend:block/shadow_berry_leaves" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 1, 0, 1 ], + "to": [ 9, 8, 9 ], + "faces": { + "down": { "uv": [ 8, 8, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 5 ], + "to": [ 16, 6, 11 ], + "faces": { + "down": { "uv": [ 9, 9, 15, 15 ], "texture": "#texture" }, + "up": { "uv": [ 1, 1, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, + "south": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, + "west": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 10 ], + "to": [ 8, 5, 15 ], + "faces": { + "down": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 8, 0, 13, 5 ], "texture": "#texture" }, + "north": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, + "south": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, + "west": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" }, + "east": { "uv": [ 3, 11, 8, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY4", + "from": [ 0, 0.5, 0 ], + "to": [ 16, 0.501, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + }, + { + "from": [13.1, -1, 0.1], + "to": [13.1, 15, 16.1], + "shade": false, + "faces": { + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 3.1], + "to": [16.1, 15, 3.1], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [16, 0, 0, 16], "texture": "#1"} + } + }, + { + "from": [0.1, -1, 13.1], + "to": [16.1, 15, 13.1], + "shade": false, + "faces": { + "north": {"uv": [16, 0, 0, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/betterend/models/item/amber_root_wild.json b/kubejs/assets/betterend/models/item/amber_root_wild.json new file mode 100644 index 000000000..d23882932 --- /dev/null +++ b/kubejs/assets/betterend/models/item/amber_root_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/amber_root_wild_mature" +} diff --git a/kubejs/assets/betterend/models/item/blossom_berry_wild.json b/kubejs/assets/betterend/models/item/blossom_berry_wild.json new file mode 100644 index 000000000..85cbcb7b9 --- /dev/null +++ b/kubejs/assets/betterend/models/item/blossom_berry_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/blossom_berry_wild_mature" +} diff --git a/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json new file mode 100644 index 000000000..19e445b33 --- /dev/null +++ b/kubejs/assets/betterend/models/item/bolux_mushroom_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/bolux_mushroom_wild_mature" +} diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json new file mode 100644 index 000000000..f252404ac --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/cave_pumpkin_wild" +} diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json new file mode 100644 index 000000000..6e95364a6 --- /dev/null +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/chorus_mushroom_wild_mature" +} diff --git a/kubejs/assets/betterend/models/item/shadow_berry_wild.json b/kubejs/assets/betterend/models/item/shadow_berry_wild.json new file mode 100644 index 000000000..0ebb8c7c2 --- /dev/null +++ b/kubejs/assets/betterend/models/item/shadow_berry_wild.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/shadow_berry_wild_mature" +} diff --git a/kubejs/assets/betterend/textures/block/amber_root_dead.png b/kubejs/assets/betterend/textures/block/amber_root_dead.png new file mode 100644 index 000000000..01abb1632 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/amber_root_dead.png differ diff --git a/kubejs/assets/betterend/textures/block/blossom_berry_dead.png b/kubejs/assets/betterend/textures/block/blossom_berry_dead.png new file mode 100644 index 000000000..9c76e1a0c Binary files /dev/null and b/kubejs/assets/betterend/textures/block/blossom_berry_dead.png differ diff --git a/kubejs/assets/betterend/textures/block/bolux_mushroom_dead.png b/kubejs/assets/betterend/textures/block/bolux_mushroom_dead.png new file mode 100644 index 000000000..63ecfb2d2 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/bolux_mushroom_dead.png differ diff --git a/kubejs/assets/betterend/textures/block/cave_pumpkin_stem_dead.png b/kubejs/assets/betterend/textures/block/cave_pumpkin_stem_dead.png new file mode 100644 index 000000000..f14202766 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/cave_pumpkin_stem_dead.png differ diff --git a/kubejs/assets/betterend/textures/block/chorus_mushroom_dead.png b/kubejs/assets/betterend/textures/block/chorus_mushroom_dead.png new file mode 100644 index 000000000..46d1a40fe Binary files /dev/null and b/kubejs/assets/betterend/textures/block/chorus_mushroom_dead.png differ diff --git a/kubejs/assets/betterend/textures/block/shadow_berry_dead.png b/kubejs/assets/betterend/textures/block/shadow_berry_dead.png new file mode 100644 index 000000000..2cac77414 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/shadow_berry_dead.png differ diff --git a/kubejs/assets/betterend/textures/block/wild_crop.png b/kubejs/assets/betterend/textures/block/wild_crop.png new file mode 100644 index 000000000..6bc383a85 Binary files /dev/null and b/kubejs/assets/betterend/textures/block/wild_crop.png differ diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json new file mode 100644 index 000000000..02f4a4702 --- /dev/null +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/getting_started/primitive_alloys.json @@ -0,0 +1,76 @@ +{ + "__comment__": "This file was automatically created by mcresources", + "name": "Primitive Alloys", + "category": "tfc:getting_started", + "icon": "tfc:ceramic/ingot_mold{tank:{\"Amount\":100,\"FluidName\":\"tfc:metal/bronze\"}}", + "pages": [ + { + "type": "patchouli:text", + "text": "$(thing)Alloys$() are a method of mixing two or more metals together, to create a new, stronger metal. During the early game, while copper is a useful metal for creating tools, the next tier of metal is one of three types of $(thing)Bronze$(). An alloy is made up of component $(thing)metals$() which must each satisfy a specific percentage of the overall whole." + }, + { + "type": "patchouli:text", + "text": "One method through which alloys can be made during the early game is through the usage of a $(thing)Small Vessel$(). The process is very similar to $(l:getting_started/finding_ores#casting)Casting$(). However, instead of using just a single metal, place enough ore pieces inside the vessel in the correct ratio to form a known alloy mix." + }, + { + "type": "patchouli:text", + "text": "For example, to create 1000 mB of $(thing)Bronze$() (shown to the right), you would need between 880 and 920 mB of $(thing)Copper$(), and between 80 and 120 mB of $(thing)Tin$().$(br2)The next three pages show the recipes of the three bronzes. Each type of bronze can be used to make tools, $(l:mechanics/armor)Armor$(), and other metal items. They are slightly different so resulting tools will have different durability, efficiency, and attack damage." + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:bronze_ingot", + "title": "Bronze", + "link_recipes": false, + "text": "$(br)$(bold)Requirements:$()$(br)$(li)70 - 80 % : $(thing)Copper$()$(li)20 - 30 % : $(thing)Tin$()$(br2)" + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:bismuth_bronze_ingot", + "title": "Bismuth Bronze", + "link_recipes": false, + "text": "$(br)$(bold)Requirements:$()$(br)$(li)20 - 30 % : $(thing)Zinc$()$(li)50 - 65 % : $(thing)Copper$()$(li)10 - 20 % : $(thing)Bismuth$()$(br2)" + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:black_bronze_ingot", + "title": "Black Bronze", + "link_recipes": false, + "text": "$(br)$(bold)Requirements:$()$(br)$(li)50 - 70 % : $(thing)Copper$()$(li)10 - 25 % : $(thing)Silver$()$(li)10 - 25 % : $(thing)Gold$()$(br2)" + }, + { + "type": "patchouli:text", + "text": "Other alloys are not suitable for creating tools. These are $(thing)Brass$(), $(thing)Rose Gold$(), and $(thing)Sterling Silver$().$(br2)$(thing)Brass$() is a useful alloy for all sorts of contraptions, including $(l:mechanics/mechanical_power)Mechanical Power$().$(br2)$(thing)Rose Gold$() and $(thing)Sterling Silver$() are used for crafting $(l:mechanics/steel#red_steel)Red Steel$() and $(l:mechanics/steel#blue_steel)Blue Steel$().", + "title": "Utility Alloys" + }, + { + "type": "patchouli:spotlight", + "anchor": "brass", + "item": "create:brass_ingot", + "title": "Brass", + "link_recipes": false, + "text": "$(br)$(bold)Requirements:$()$(br)$(li)70 - 80 % : $(thing)Copper$()$(li)20 - 30 % : $(thing)Zinc$()$(br2)" + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:rose_gold_ingot", + "title": "Rose Gold", + "link_recipes": false, + "text": "$(br)$(bold)Requirements:$()$(br)$(li)15 - 30 % : $(thing)Copper$()$(li)70 - 85 % : $(thing)Gold$()$(br2)" + }, + { + "type": "patchouli:spotlight", + "item": "gtceu:sterling_silver_ingot", + "title": "Sterling Silver", + "link_recipes": false, + "text": "$(br)$(bold)Requirements:$()$(br)$(li)20 - 40 % : $(thing)Copper$()$(li)60 - 80 % : $(thing)Silver$()$(br2)" + } + ], + "read_by_default": true, + "sortnum": 5, + "extra_recipe_mappings": { + "gtceu:bronze_ingot": 3, + "gtceu:bismuth_bronze_ingot": 4, + "gtceu:black_bronze_ingot": 5, + "gtceu:brass_ingot": 7 + } +} \ No newline at end of file diff --git a/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json b/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json new file mode 100644 index 000000000..9d73324fe --- /dev/null +++ b/kubejs/data/expatternprovider/loot_tables/blocks/ex_emc_interface.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "expatternprovider:ex_emc_interface" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json b/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json new file mode 100644 index 000000000..b293a6912 --- /dev/null +++ b/kubejs/data/megacells/loot_tables/blocks/mega_emc_interface.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "megacells:mega_emc_interface" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index f0bfc89f1..a5f7cbab2 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -179,7 +179,7 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler('tfg:railways/conductor_whistle') .itemInputs('#forge:plates/brass') - .circuit(4) + .circuit(30) .itemOutputs('railways:conductor_whistle') .duration(200) .EUt(28) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index b8fac6c54..a84f4fe8a 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -206,7 +206,7 @@ const registerTFCRecipes = (event) => { generateMixerRecipe(event, 'tfc:powder/wood_ash', "#tfg:clean_water 200", [], null, Fluid.of('tfc:lye', 200), 100, 2, 64, 'lye_from_wood_ash') generateMixerRecipe(event, '#forge:dusts/sodium_hydroxide', "#tfg:clean_water 1000", - [], null, Fluid.of('tfc:lye', 1000), 100, 2, 64, 'lye_from_NaOH') + [], null, Fluid.of('tfc:lye', 1000), 100, 2, 64, 'lye_from_sodium_hydroxide') event.recipes.tfc.pot([], Fluid.of('tfc:lye', 1000), 100, 80) .itemOutput('gtceu:sodium_hydroxide_dust') diff --git a/pakku-lock.json b/pakku-lock.json index 049f90d37..5dcea02a4 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -330,43 +330,6 @@ } ] }, - { - "pakku_id": "zpZC9ZXFxQQlQXOb", - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "ad-astra-auto-lander" - }, - "name": { - "curseforge": "Ad Astra: Auto Lander" - }, - "id": { - "curseforge": "1183249" - }, - "files": [ - { - "type": "curseforge", - "file_name": "adastra_autolanding-0.2-1.20.1.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6108/119/adastra_autolanding-0.2-1.20.1.jar", - "id": "6108119", - "parent_id": "1183249", - "hashes": { - "sha1": "3338914bcedd51b02b0137fb4f9394d55550657b", - "md5": "d6713f2d3931dca528ee8aed0eff3c78" - }, - "required_dependencies": [], - "size": 6759, - "date_published": "2025-01-20T22:07:39.787Z" - } - ] - }, { "pakku_id": "FUkrlSRxJw3vXHSa", "pakku_links": [ @@ -4691,7 +4654,7 @@ "files": [ { "type": "curseforge", - "file_name": "domum_ornamentum-1.20.1-1.0.290-snapshot-universal.jar", + "file_name": "domum_ornamentum-1.20.1-1.0.291-snapshot-universal.jar", "mc_versions": [ "1.20.1" ], @@ -4699,16 +4662,16 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6721/676/domum_ornamentum-1.20.1-1.0.290-snapshot-universal.jar", - "id": "6721676", + "url": "https://edge.forgecdn.net/files/6870/756/domum_ornamentum-1.20.1-1.0.291-snapshot-universal.jar", + "id": "6870756", "parent_id": "527361", "hashes": { - "sha1": "040a8e565583ce3bf8829e32204e7a3681f1ab10", - "md5": "1f1d44d1e4ae3a8e1314ca1dad965529" + "sha1": "3544e2197b7c376fbc7650fff8502a7a3397357e", + "md5": "be5569eb31dda1579e968c9e8508bf0a" }, "required_dependencies": [], - "size": 1140819, - "date_published": "2025-07-02T15:56:45.437Z" + "size": 1140927, + "date_published": "2025-08-10T10:38:15.523Z" } ] }, @@ -11458,7 +11421,7 @@ { "pakku_id": "CKhfz5UfCp2SSXt9", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "smooth-boot-reloaded", "modrinth": "smooth-boot-reloaded" @@ -12632,14 +12595,18 @@ "64uacGcEw697jVGs" ], "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "tfc-punishment-for-death" + "curseforge": "tfc-punishment-for-death", + "modrinth": "tfc-punishment-for-death" }, "name": { - "curseforge": "TFC Punishment for Death" + "curseforge": "TFC Punishment for Death", + "modrinth": "TFC Punishment for Death" }, "id": { - "curseforge": "1258250" + "curseforge": "1258250", + "modrinth": "hupCZlMO" }, "files": [ { @@ -12665,6 +12632,30 @@ ], "size": 34133, "date_published": "2025-06-04T10:12:24.677Z" + }, + { + "type": "modrinth", + "file_name": "TFC_punishment_for_death-1.20.1-1.0.0.15.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "beta", + "url": "https://cdn.modrinth.com/data/hupCZlMO/versions/lAz6Jz59/TFC_punishment_for_death-1.20.1-1.0.0.15.jar", + "id": "lAz6Jz59", + "parent_id": "hupCZlMO", + "hashes": { + "sha512": "285289bbe30b8dfd3c5f1093bfdb9bbea008053ef2b1ceefbd6562304e5335f9feb59fb4e359acaf0776dc9825e652daaf558a75254caad9cfed21d3f9fb1a39", + "sha1": "0c7ff3607981f60970fdf85ee52c7e50ad9f5fcd" + }, + "required_dependencies": [ + "JaCEZUhg" + ], + "size": 34133, + "date_published": "2025-07-15T13:40:22.577013Z" } ] }, @@ -13373,7 +13364,7 @@ ] }, { - "pakku_id": "JNiWNhtliSnMqAGr", + "pakku_id": "q8hf1a0p1LNYh8as", "pakku_links": [ "WN9DdLqsRKVeZIc9", "64uacGcEw697jVGs" @@ -13395,7 +13386,7 @@ "files": [ { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.9.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.10.jar", "mc_versions": [ "1.20.1" ], @@ -13404,23 +13395,23 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6870/950/TerraFirmaGreg-Core-Modern-0.7.9.jar", - "id": "6870950", + "url": "https://edge.forgecdn.net/files/6872/582/TerraFirmaGreg-Core-Modern-0.7.10.jar", + "id": "6872582", "parent_id": "513402", "hashes": { - "sha1": "50adacde287cf30e7bea18c63aee18af31edae02", - "md5": "b40a77bfd1ab41904f9a716e2530debd" + "sha1": "9a5c98fcaef9d12fdc1a86035ebf4f9170d1cb2e", + "md5": "ca805dc57f89624bf9e53e4f9babda0a" }, "required_dependencies": [ "890405", "302973" ], - "size": 514012, - "date_published": "2025-08-10T11:22:57.333Z" + "size": 515916, + "date_published": "2025-08-10T20:34:53.927Z" }, { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.7.9.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.7.10.jar", "mc_versions": [ "1.20.1" ], @@ -13429,19 +13420,19 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/WbpWRLID/TerraFirmaGreg-Core-Modern-0.7.9.jar", - "id": "WbpWRLID", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/8m3psJno/TerraFirmaGreg-Core-Modern-0.7.10.jar", + "id": "8m3psJno", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "8d4d59fff28f9f6f5bcc1243ebc1eec4a9086ddd4d3868c2c8f165a6cd1bc1b4688e8e529b1f922a440015c65c2c6347aeffbbf83865f092f9d1e821da2ef51a", - "sha1": "50adacde287cf30e7bea18c63aee18af31edae02" + "sha512": "bb8b2907e7dcf1e630aac76575cefc04cc594b6da0aeafa76bed5a5838677720bddf2b134d3480e06e850ff041f3963b1d22803c8ac873f315e32b698f01ef29", + "sha1": "9a5c98fcaef9d12fdc1a86035ebf4f9170d1cb2e" }, "required_dependencies": [ "JaCEZUhg", "7tG215v7" ], - "size": 514012, - "date_published": "2025-08-10T11:22:59.841080Z" + "size": 515916, + "date_published": "2025-08-10T20:34:55.642076Z" } ] }, @@ -13814,7 +13805,7 @@ { "pakku_id": "tdBDW3xpPBc3E2mt", "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "xaeros-world-map", "modrinth": "xaeros-world-map" diff --git a/pakku.json b/pakku.json index d173412c4..cee9fd870 100644 --- a/pakku.json +++ b/pakku.json @@ -19,7 +19,8 @@ "server_starter.conf", "server-icon.png", "start_server.bat", - "README.md" + "README.md", + "!kubejs/assets/**" ], "client_overrides": [ "resourcepacks" @@ -214,9 +215,6 @@ "pick-up-notifier": { "side": "CLIENT" }, - "smooth-boot-reloaded": { - "side": "CLIENT" - }, "resourceful-config": { "side": "BOTH" }, @@ -241,6 +239,9 @@ "xaeros-minimap": { "side": "BOTH" }, + "xaeros-world-map": { + "side": "BOTH" + }, "particular-reforged": { "side": "BOTH" },