diff --git a/CHANGELOG.md b/CHANGELOG.md index cb9de4e89..b26591c19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Changes - Water wheels are now usable again in all (earth + beneath) biomes outside of rivers, *but* at a reduced efficiency @Pyritie - Added dinosaur nest structures to mars @Pyritie +- Added ULV super tanks and super drums, and a 4A HV Dynamo Hatch for your Large Solar Array MK1 @Pyritie - Added meats for the surfer, cruncher, stackatick and primitive creatures mobs, reworked the textures of the others (#2001, #2014) @Redeix - Added a recipe for turning glass dust into lamp glass @Pyritie - Added more recipe unification for quartz, certus quartz, create's minerals, fixed wall chiseling recipes (#2005) @vidal-adrien diff --git a/kubejs/assets/gtceu/blockstates/hv_energy_output_hatch_4a.json b/kubejs/assets/gtceu/blockstates/hv_energy_output_hatch_4a.json new file mode 100644 index 000000000..9114cd061 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/hv_energy_output_hatch_4a.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtceu:block/machine/hv_energy_output_hatch_4a", + "x": 90 + }, + "facing=east": { + "model": "gtceu:block/machine/hv_energy_output_hatch_4a", + "y": 90 + }, + "facing=north": { + "model": "gtceu:block/machine/hv_energy_output_hatch_4a" + }, + "facing=south": { + "model": "gtceu:block/machine/hv_energy_output_hatch_4a", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtceu:block/machine/hv_energy_output_hatch_4a", + "x": 270 + }, + "facing=west": { + "model": "gtceu:block/machine/hv_energy_output_hatch_4a", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ulv_hermetic_casing.json b/kubejs/assets/gtceu/blockstates/ulv_hermetic_casing.json new file mode 100644 index 000000000..03da19851 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ulv_hermetic_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "gtceu:block/ulv_hermetic_casing" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ulv_super_chest.json b/kubejs/assets/gtceu/blockstates/ulv_super_chest.json new file mode 100644 index 000000000..3c0133212 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ulv_super_chest.json @@ -0,0 +1,114 @@ +{ + "variants": { + "facing=down,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_chest", + "x": 90 + }, + "facing=down,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_chest", + "x": 90 + }, + "facing=down,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_chest", + "x": 90 + }, + "facing=down,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_chest", + "x": 90 + }, + "facing=east,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 90 + }, + "facing=east,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_chest", + "y": 90 + }, + "facing=east,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 90 + }, + "facing=east,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 90 + }, + "facing=north,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_chest" + }, + "facing=north,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_chest" + }, + "facing=north,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_chest" + }, + "facing=north,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_chest" + }, + "facing=south,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 180 + }, + "facing=south,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_chest", + "y": 180 + }, + "facing=south,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 180 + }, + "facing=south,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 180 + }, + "facing=up,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_chest", + "x": 270 + }, + "facing=up,upwards_facing=north": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_chest", + "x": 270 + }, + "facing=up,upwards_facing=south": { + "model": "gtceu:block/machine/ulv_super_chest", + "x": 270 + }, + "facing=up,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_chest", + "x": 270 + }, + "facing=west,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 270 + }, + "facing=west,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_chest", + "y": 270 + }, + "facing=west,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 270 + }, + "facing=west,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_chest", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/blockstates/ulv_super_tank.json b/kubejs/assets/gtceu/blockstates/ulv_super_tank.json new file mode 100644 index 000000000..30d669685 --- /dev/null +++ b/kubejs/assets/gtceu/blockstates/ulv_super_tank.json @@ -0,0 +1,114 @@ +{ + "variants": { + "facing=down,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_tank", + "x": 90 + }, + "facing=down,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_tank", + "x": 90 + }, + "facing=down,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_tank", + "x": 90 + }, + "facing=down,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_tank", + "x": 90 + }, + "facing=east,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 90 + }, + "facing=east,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_tank", + "y": 90 + }, + "facing=east,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 90 + }, + "facing=east,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 90 + }, + "facing=north,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_tank" + }, + "facing=north,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_tank" + }, + "facing=north,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_tank" + }, + "facing=north,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_tank" + }, + "facing=south,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 180 + }, + "facing=south,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_tank", + "y": 180 + }, + "facing=south,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 180 + }, + "facing=south,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 180 + }, + "facing=up,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_tank", + "x": 270 + }, + "facing=up,upwards_facing=north": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_tank", + "x": 270 + }, + "facing=up,upwards_facing=south": { + "model": "gtceu:block/machine/ulv_super_tank", + "x": 270 + }, + "facing=up,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_tank", + "x": 270 + }, + "facing=west,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 270 + }, + "facing=west,upwards_facing=north": { + "model": "gtceu:block/machine/ulv_super_tank", + "y": 270 + }, + "facing=west,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 270 + }, + "facing=west,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtceu:block/machine/ulv_super_tank", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 8a7c20968..35bf70759 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -14,6 +14,10 @@ "block.gtceu.ostrum_harvester": "Ostrum Harvester", "block.gtceu.moon_dust_harvester": "Moon Dust Harvester", "block.gtceu.ostrum_linear_accelerator": "Ostrum Linear Accelerator", + "block.gtceu.ulv_super_tank": "Basic Super Tank", + "block.gtceu.ulv_super_chest": "Basic Super Chest", + "block.gtceu.ulv_hermetic_casing": "Basic Hermetic Casing", + "block.gtceu.hv_energy_output_hatch_4a": "§6HV 4A Dynamo Hatch§r", "block.tfg.bioreactor": "Bioreactor", "block.tfg.growth_chamber": "Growth Chamber", "block.tfg.single_itemstack_bus": "Limiting Input Bus", diff --git a/kubejs/assets/gtceu/models/block/machine/hv_energy_output_hatch_4a.json b/kubejs/assets/gtceu/models/block/machine/hv_energy_output_hatch_4a.json new file mode 100644 index 000000000..395a8e007 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/hv_energy_output_hatch_4a.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:hv_energy_output_hatch_4a", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "is_formed=false": { + "model": { + "parent": "gtceu:block/machine/part/energy_output_hatch_4a", + "textures": { + "bottom": "gtceu:block/casings/voltage/hv/bottom", + "side": "gtceu:block/casings/voltage/hv/side", + "top": "gtceu:block/casings/voltage/hv/top" + } + } + }, + "is_formed=true": { + "model": { + "parent": "gtceu:block/machine/part/energy_output_hatch_4a", + "textures": { + "bottom": "gtceu:block/casings/voltage/hv/bottom", + "side": "gtceu:block/casings/voltage/hv/side", + "top": "gtceu:block/casings/voltage/hv/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ulv_super_chest.json b/kubejs/assets/gtceu/models/block/machine/ulv_super_chest.json new file mode 100644 index 000000000..053054cfa --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ulv_super_chest.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "dynamic_renders": [ + { + "type": "gtceu:quantum_chest_item" + } + ], + "loader": "gtceu:machine", + "machine": "gtceu:ulv_super_chest", + "variants": { + "": { + "model": { + "parent": "gtceu:block/machine/template/quantum/quantum_chest", + "textures": { + "bottom": "gtceu:block/casings/voltage/ulv/bottom", + "side": "gtceu:block/casings/voltage/ulv/side", + "top": "gtceu:block/casings/voltage/ulv/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/machine/ulv_super_tank.json b/kubejs/assets/gtceu/models/block/machine/ulv_super_tank.json new file mode 100644 index 000000000..eea14811a --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/ulv_super_tank.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "dynamic_renders": [ + { + "type": "gtceu:quantum_tank_fluid" + } + ], + "loader": "gtceu:machine", + "machine": "gtceu:ulv_super_tank", + "variants": { + "": { + "model": { + "parent": "gtceu:block/machine/template/quantum/quantum_tank", + "textures": { + "bottom": "gtceu:block/casings/voltage/ulv/bottom", + "side": "gtceu:block/casings/voltage/ulv/side", + "top": "gtceu:block/casings/voltage/ulv/top" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/block/ulv_hermetic_casing.json b/kubejs/assets/gtceu/models/block/ulv_hermetic_casing.json new file mode 100644 index 000000000..efbb27790 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/ulv_hermetic_casing.json @@ -0,0 +1,8 @@ +{ + "parent": "gtceu:block/hermetic_casing", + "textures": { + "bot_bottom": "gtceu:block/casings/voltage/ulv/bottom", + "bot_side": "gtceu:block/casings/voltage/ulv/side", + "bot_top": "gtceu:block/casings/voltage/ulv/top" + } +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/hv_energy_output_hatch_4a.json b/kubejs/assets/gtceu/models/item/hv_energy_output_hatch_4a.json new file mode 100644 index 000000000..59f566893 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/hv_energy_output_hatch_4a.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/hv_energy_output_hatch_4a" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ulv_hermetic_casing.json b/kubejs/assets/gtceu/models/item/ulv_hermetic_casing.json new file mode 100644 index 000000000..3da9c77d0 --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ulv_hermetic_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/ulv_hermetic_casing" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ulv_super_chest.json b/kubejs/assets/gtceu/models/item/ulv_super_chest.json new file mode 100644 index 000000000..46ded60cc --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ulv_super_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ulv_super_chest" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/models/item/ulv_super_tank.json b/kubejs/assets/gtceu/models/item/ulv_super_tank.json new file mode 100644 index 000000000..0e6da816c --- /dev/null +++ b/kubejs/assets/gtceu/models/item/ulv_super_tank.json @@ -0,0 +1,3 @@ +{ + "parent": "gtceu:block/machine/ulv_super_tank" +} \ No newline at end of file diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index c765def36..d31bb7bf3 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -64,10 +64,26 @@ const registerCreateItemTags = (event) => { event.add('create:non_movable', 'gtceu:titanium_crate') event.add('create:non_movable', 'gtceu:tungsten_steel_crate') event.add('create:non_movable', '#create:toolboxes') + event.add('create:non_movable', 'gtceu:ulv_super_chest') event.add('create:non_movable', 'gtceu:lv_super_chest') event.add('create:non_movable', 'gtceu:mv_super_chest') event.add('create:non_movable', 'gtceu:hv_super_chest') event.add('create:non_movable', 'gtceu:ev_super_chest') + event.add('create:non_movable', 'gtceu:iv_quantum_chest') + event.add('create:non_movable', 'gtceu:luv_quantum_chest') + event.add('create:non_movable', 'gtceu:zpm_quantum_chest') + event.add('create:non_movable', 'gtceu:uv_quantum_chest') + event.add('create:non_movable', 'gtceu:uhv_quantum_chest') + event.add('create:non_movable', 'gtceu:ulv_super_tank') + event.add('create:non_movable', 'gtceu:lv_super_tank') + event.add('create:non_movable', 'gtceu:mv_super_tank') + event.add('create:non_movable', 'gtceu:hv_super_tank') + event.add('create:non_movable', 'gtceu:ev_super_tank') + event.add('create:non_movable', 'gtceu:iv_quantum_tank') + event.add('create:non_movable', 'gtceu:luv_quantum_tank') + event.add('create:non_movable', 'gtceu:zpm_quantum_tank') + event.add('create:non_movable', 'gtceu:uv_quantum_tank') + event.add('create:non_movable', 'gtceu:uhv_quantum_tank') event.add('create:non_movable', 'tfg:spice') event.add('create:non_movable', 'tfg:geyser_source') event.add('create:non_movable', 'tfg:geyser_source_small') diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index f3febe335..5ddf60e96 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -391,6 +391,7 @@ const registerTFGItemTags = (event) => { event.add('tfg:cannot_launch_in_railgun', 'gtceu:titanium_crate') event.add('tfg:cannot_launch_in_railgun', 'gtceu:tungsten_steel_crate') event.add('tfg:cannot_launch_in_railgun', '#create:toolboxes') + event.add('tfg:cannot_launch_in_railgun', 'gtceu:ulv_super_chest') event.add('tfg:cannot_launch_in_railgun', 'gtceu:lv_super_chest') event.add('tfg:cannot_launch_in_railgun', 'gtceu:mv_super_chest') event.add('tfg:cannot_launch_in_railgun', 'gtceu:hv_super_chest') @@ -400,6 +401,7 @@ const registerTFGItemTags = (event) => { event.add('tfg:cannot_launch_in_railgun', 'gtceu:zpm_quantum_chest') event.add('tfg:cannot_launch_in_railgun', 'gtceu:uv_quantum_chest') event.add('tfg:cannot_launch_in_railgun', 'gtceu:uhv_quantum_chest') + event.add('tfg:cannot_launch_in_railgun', 'gtceu:ulv_super_tank') event.add('tfg:cannot_launch_in_railgun', 'gtceu:lv_super_tank') event.add('tfg:cannot_launch_in_railgun', 'gtceu:mv_super_tank') event.add('tfg:cannot_launch_in_railgun', 'gtceu:hv_super_tank')