diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/down.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/down.png new file mode 100644 index 000000000..a8649d791 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/down.png differ diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/east.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/east.png new file mode 100644 index 000000000..c48dd60a4 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/east.png differ diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/north.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/north.png new file mode 100644 index 000000000..4bb960171 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/north.png differ diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/south.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/south.png new file mode 100644 index 000000000..87a612bfd Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/south.png differ diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/up.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/up.png new file mode 100644 index 000000000..ef570ff97 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/up.png differ diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/west.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/west.png new file mode 100644 index 000000000..4cacf2516 Binary files /dev/null and b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/west.png differ diff --git a/kubejs/assets/tfg/blockstates/marker/mars.json b/kubejs/assets/tfg/blockstates/marker/mars.json new file mode 100644 index 000000000..4e5573f11 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/mars.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/mars" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/marker/mercury.json b/kubejs/assets/tfg/blockstates/marker/mercury.json new file mode 100644 index 000000000..44bd64632 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/mercury.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/mercury" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/marker/moon.json b/kubejs/assets/tfg/blockstates/marker/moon.json new file mode 100644 index 000000000..6e386c27f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/moon.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/moon" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/marker/venus.json b/kubejs/assets/tfg/blockstates/marker/venus.json new file mode 100644 index 000000000..d398f1e96 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/venus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/venus" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/mars.json b/kubejs/assets/tfg/models/block/marker/mars.json new file mode 100644 index 000000000..048adf965 --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/mars.json @@ -0,0 +1,42 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "gui_light": "front", + "textures": { + "0": "ad_astra:block/globe/mars_globe", + "particle": "#0" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "uv": [ 3.75, 3.75, 7.5, 7.5 ], + "texture": "#0" + }, + "east": { + "uv": [ 0, 3.75, 3.75, 7.5 ], + "texture": "#0" + }, + "south": { + "uv": [ 11.25, 3.75, 15, 7.5 ], + "texture": "#0" + }, + "west": { + "uv": [ 7.5, 3.75, 11.25, 7.5 ], + "texture": "#0" + }, + "up": { + "uv": [ 7.5, 3.75, 3.75, 0 ], + "texture": "#0" + }, + "down": { + "uv": [ 3.75, 7.5, 0, 11.25 ], + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/mercury.json b/kubejs/assets/tfg/models/block/marker/mercury.json new file mode 100644 index 000000000..436dc0e7d --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/mercury.json @@ -0,0 +1,42 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "gui_light": "front", + "textures": { + "0": "ad_astra:block/globe/mercury_globe", + "particle": "#0" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "uv": [ 3.75, 3.75, 7.5, 7.5 ], + "texture": "#0" + }, + "east": { + "uv": [ 0, 3.75, 3.75, 7.5 ], + "texture": "#0" + }, + "south": { + "uv": [ 11.25, 3.75, 15, 7.5 ], + "texture": "#0" + }, + "west": { + "uv": [ 7.5, 3.75, 11.25, 7.5 ], + "texture": "#0" + }, + "up": { + "uv": [ 7.5, 3.75, 3.75, 0 ], + "texture": "#0" + }, + "down": { + "uv": [ 3.75, 7.5, 0, 11.25 ], + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/moon.json b/kubejs/assets/tfg/models/block/marker/moon.json new file mode 100644 index 000000000..cb52279ae --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/moon.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "moon_globe", + "particle": "moon_globe" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [3.75, 3.75, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [0, 3.75, 3.75, 7.5], "texture": "#0"}, + "south": {"uv": [11.25, 3.75, 15, 7.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.75, 11.25, 7.5], "texture": "#0"}, + "up": {"uv": [7.5, 3.75, 3.75, 0], "texture": "#0"}, + "down": {"uv": [3.75, 7.5, 0, 11.25], "texture": "#0"} + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/venus.json b/kubejs/assets/tfg/models/block/marker/venus.json new file mode 100644 index 000000000..c216d3856 --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/venus.json @@ -0,0 +1,42 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "gui_light": "front", + "textures": { + "0": "ad_astra:block/globe/venus_globe", + "particle": "#0" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "uv": [ 3.75, 3.75, 7.5, 7.5 ], + "texture": "#0" + }, + "east": { + "uv": [ 0, 3.75, 3.75, 7.5 ], + "texture": "#0" + }, + "south": { + "uv": [ 11.25, 3.75, 15, 7.5 ], + "texture": "#0" + }, + "west": { + "uv": [ 7.5, 3.75, 11.25, 7.5 ], + "texture": "#0" + }, + "up": { + "uv": [ 7.5, 3.75, 3.75, 0 ], + "texture": "#0" + }, + "down": { + "uv": [ 3.75, 7.5, 0, 11.25 ], + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/mars.json b/kubejs/assets/tfg/models/item/marker/mars.json new file mode 100644 index 000000000..843d91086 --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/mars.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/mars" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/mercury.json b/kubejs/assets/tfg/models/item/marker/mercury.json new file mode 100644 index 000000000..39847666b --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/mercury.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/mercury" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/moon.json b/kubejs/assets/tfg/models/item/marker/moon.json new file mode 100644 index 000000000..6055d0605 --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/moon.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/moon" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/venus.json b/kubejs/assets/tfg/models/item/marker/venus.json new file mode 100644 index 000000000..cbc4a583d --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/venus.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/venus" +} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 5a9d41231..38f06e40c 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -84,7 +84,7 @@ GTCEuStartupEvents.materialModification(event => { GTCEuStartupEvents.registry('gtceu:dimension_marker', event => { - registerAdAstraDimensionMarkers(event) + registerTFGDimensionMarkers(event) }) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index fa4c2ec61..bc92d6eca 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1,5 +1,43 @@ function registerTFGSpaceBlocks(event) { + // Dimension markers + + event.create('tfg:marker/moon') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/moon' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:marker/mars') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/mars' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:marker/venus') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/venus' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:marker/mercury') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/mercury' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + // Hardened stones event.create('tfg:rock/hardened_moon_stone') diff --git a/kubejs/startup_scripts/ad_astra/dimension_markers.js b/kubejs/startup_scripts/tfg/dimension_markers.js similarity index 60% rename from kubejs/startup_scripts/ad_astra/dimension_markers.js rename to kubejs/startup_scripts/tfg/dimension_markers.js index 7d8b7d73c..2afcb4c6f 100644 --- a/kubejs/startup_scripts/ad_astra/dimension_markers.js +++ b/kubejs/startup_scripts/tfg/dimension_markers.js @@ -1,29 +1,30 @@ // priority: 0 -function registerAdAstraDimensionMarkers(event) { +function registerTFGDimensionMarkers(event) { + // TODO event.create('ad_astra:earth_orbit') .iconSupplier(() => Item.of('ad_astra:earth_globe').getItem()) .tier(1) .overrideName('Earth Orbit') event.create('ad_astra:moon') - .iconSupplier(() => Item.of('ad_astra:moon_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/moon').getItem()) .tier(1) .overrideName('The Moon') event.create('ad_astra:mars') - .iconSupplier(() => Item.of('ad_astra:mars_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/mars').getItem()) .tier(2) .overrideName('Mars') event.create('ad_astra:venus') - .iconSupplier(() => Item.of('ad_astra:venus_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/venus').getItem()) .tier(3) .overrideName('Venus') event.create('ad_astra:mercury') - .iconSupplier(() => Item.of('ad_astra:mercury_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/mercury').getItem()) .tier(3) .overrideName('Mercury') } \ No newline at end of file