diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index deed341fb..e9cc62e9e 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -366,6 +366,9 @@ "item.tfg.food.cooked_crawlermari": "Cooked Crawlermari", "item.tfg.food.raw_limpet": "Raw Limpet", "item.tfg.food.cooked_limpet": "Cooked Limpet", + "item.tfg.food.raw_moon_rabbit": "Raw Moon Rabbit", + "item.tfg.food.cooked_moon_rabbit": "Cooked Moon Rabbit", + "item.tfg.spawn_egg.moon_rabbit": "Moon Rabbit Spawn Egg", "item.tfg.food.freeze_dried.red_grapes": "Freeze Dried Red Grapes", "item.tfg.food.freeze_dried.white_grapes": "Freeze Dried White Grapes", "item.tfg.food.freeze_dried.glow_berries": "Freeze Dried Glow Berries", @@ -1693,7 +1696,7 @@ "quests.space_survival.food.task": "Any space food", "quests.space_survival.satellite.title": "Space Stations", "quests.space_survival.satellite.subtitle": "For when you really want to get away from it all", - "quests.space_survival.satellite.desc": "By putting the above items into a Rocket's inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.", + "quests.space_survival.satellite.desc": "By keeping the above items in your inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.", "quests.space_survival.flag.title": "Flag Planter", "quests.space_survival.flag.subtitle": "LunaFirmaCraft", "quests.space_survival.flag.desc": "Introduce yourself to the Moon by planting a flag with whatever image you like on it!", diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json b/kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json new file mode 100644 index 000000000..18c99e7c4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_blue_solar_panel"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json new file mode 100644 index 000000000..3e6b24fd9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_clean_stainless_steel_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json b/kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json new file mode 100644 index 000000000..2fbf76514 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_desh_ptfe"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json b/kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json new file mode 100644 index 000000000..4cdbd4bbc --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_green_solar_panel"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json new file mode 100644 index 000000000..6c707c62b --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_iron_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json new file mode 100644 index 000000000..3fe3d33bf --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_ptfe_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json b/kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json new file mode 100644 index 000000000..cfbebc2ef --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_red_solar_panel"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json new file mode 100644 index 000000000..3c3ae106f --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_stainless_steel_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json b/kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json new file mode 100644 index 000000000..185724546 --- /dev/null +++ b/kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/spawn_egg/moon_rabbit" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png new file mode 100644 index 000000000..22ca0f381 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta new file mode 100644 index 000000000..c69cb893f --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_blue_solar_panel_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel_ctm.png new file mode 100644 index 000000000..6e367f22f Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png new file mode 100644 index 000000000..9dd8848c8 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta new file mode 100644 index 000000000..87c726471 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_clean_stainless_steel_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh_ctm.png new file mode 100644 index 000000000..641cdb723 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png new file mode 100644 index 000000000..9ef259302 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png.mcmeta new file mode 100644 index 000000000..7e135aceb --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_desh_ptfe_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe_ctm.png new file mode 100644 index 000000000..b4fc8556f Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png new file mode 100644 index 000000000..0aa35dcf8 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png.mcmeta new file mode 100644 index 000000000..6c068adce --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_green_solar_panel_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel_ctm.png new file mode 100644 index 000000000..60a04d9fe Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png new file mode 100644 index 000000000..71b03a85a Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png.mcmeta new file mode 100644 index 000000000..ea6034624 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_iron_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh_ctm.png new file mode 100644 index 000000000..ad07b4b61 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png new file mode 100644 index 000000000..d0e60b604 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta new file mode 100644 index 000000000..bb510aff7 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_ptfe_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh_ctm.png new file mode 100644 index 000000000..b4eafc6f3 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png new file mode 100644 index 000000000..7d45fbbb0 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta new file mode 100644 index 000000000..c5464f67c --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_red_solar_panel_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel_ctm.png new file mode 100644 index 000000000..203abe54f Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png new file mode 100644 index 000000000..bb72ce449 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta new file mode 100644 index 000000000..765ff61b8 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_stainless_steel_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh_ctm.png new file mode 100644 index 000000000..3bb4708c1 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh_ctm.png differ diff --git a/kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png b/kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png new file mode 100644 index 000000000..c2d29f071 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png differ diff --git a/kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png b/kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png new file mode 100644 index 000000000..30d09064f Binary files /dev/null and b/kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png differ diff --git a/kubejs/assets/tfg/textures/item/spawn_egg/moon_rabbit.png b/kubejs/assets/tfg/textures/item/spawn_egg/moon_rabbit.png new file mode 100644 index 000000000..0e146c58e Binary files /dev/null and b/kubejs/assets/tfg/textures/item/spawn_egg/moon_rabbit.png differ diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 6784d385e..17b9cf992 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -15,6 +15,20 @@ const registerTFGBlocks = (event) => { item.modelJson({ parent: 'minecraft:block/end_portal_frame' }) }) + // #region Machine Casings + + global.TFG_MACHINE_CASINGS.forEach(type => { + event.create(`tfg:block/casings/${type}`) + .model(`tfg:block/casings/${type}`) + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor('color_light_gray') + }) + + //#endregion + // #region Decorative vases global.MINECRAFT_DYE_NAMES.forEach(color => { event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal') diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 05e2bf04d..a10f91b82 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -68,6 +68,17 @@ global.MARS_BIOMES = [ 'tfg:mars/martian_mountains' ] +global.TFG_MACHINE_CASINGS = [ + 'machine_casing_clean_stainless_steel_desh', + 'machine_casing_desh_ptfe', + 'machine_casing_iron_desh', + 'machine_casing_ptfe_desh', + 'machine_casing_stainless_steel_desh', + 'machine_casing_blue_solar_panel', + 'machine_casing_green_solar_panel', + 'machine_casing_red_solar_panel' +]; + global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"]; global.FOOD_FRUIT = [