merge

kubejs/assets/minecraft/atlases/armor_trims.json

@@ -0,0 +1,92 @@
+{
+	"sources": [
+		{
+			"type": "paletted_permutations",
+			"textures": [
+				"trims/models/armor/coast",
+				"trims/models/armor/coast_leggings",
+				"trims/models/armor/sentry",
+				"trims/models/armor/sentry_leggings",
+				"trims/models/armor/dune",
+				"trims/models/armor/dune_leggings",
+				"trims/models/armor/wild",
+				"trims/models/armor/wild_leggings",
+				"trims/models/armor/ward",
+				"trims/models/armor/ward_leggings",
+				"trims/models/armor/eye",
+				"trims/models/armor/eye_leggings",
+				"trims/models/armor/vex",
+				"trims/models/armor/vex_leggings",
+				"trims/models/armor/tide",
+				"trims/models/armor/tide_leggings",
+				"trims/models/armor/snout",
+				"trims/models/armor/snout_leggings",
+				"trims/models/armor/rib",
+				"trims/models/armor/rib_leggings",
+				"trims/models/armor/spire",
+				"trims/models/armor/spire_leggings",
+				"trims/models/armor/wayfinder",
+				"trims/models/armor/wayfinder_leggings",
+				"trims/models/armor/shaper",
+				"trims/models/armor/shaper_leggings",
+				"trims/models/armor/silence",
+				"trims/models/armor/silence_leggings",
+				"trims/models/armor/raiser",
+				"trims/models/armor/raiser_leggings",
+				"trims/models/armor/host",
+				"trims/models/armor/host_leggings"
+			],
+			"palette_key": "trims/color_palettes/trim_palette",
+			"permutations": {
+				"almandine_tfc": "tfc:color_palettes/trims/almandine_tfc",
+				"andradite_tfc": "tfc:color_palettes/trims/andradite_tfc",
+				"blue_topaz_tfc": "tfc:color_palettes/trims/blue_topaz_tfc",
+				"cinnabar_tfc": "tfc:color_palettes/trims/cinnabar_tfc",
+				"coal_tfc": "tfc:color_palettes/trims/coal_tfc",
+				"diamond_tfc": "tfc:color_palettes/trims/diamond_tfc",
+				"emerald_tfc": "tfc:color_palettes/trims/emerald_tfc",
+				"green_sapphire_tfc": "tfc:color_palettes/trims/green_sapphire_tfc",
+				"grossular_tfc": "tfc:color_palettes/trims/grossular_tfc",
+				"rutile_tfc": "tfc:color_palettes/trims/rutile_tfc",
+				"lazurite_tfc": "tfc:color_palettes/trims/lazurite_tfc",
+				"pyrope_tfc": "tfc:color_palettes/trims/pyrope_tfc",
+				"rock_salt_tfc": "tfc:color_palettes/trims/rock_salt_tfc",
+				"ruby_tfc": "tfc:color_palettes/trims/ruby_tfc",
+				"salt_tfc": "tfc:color_palettes/trims/salt_tfc",
+				"sapphire_tfc": "tfc:color_palettes/trims/sapphire_tfc",
+				"sodalite_tfc": "tfc:color_palettes/trims/sodalite_tfc",
+				"coke_tfc": "tfc:color_palettes/trims/coke_tfc",
+				"spessartine_tfc": "tfc:color_palettes/trims/spessartine_tfc",
+				"topaz_tfc": "tfc:color_palettes/trims/topaz_tfc",
+				"uvarovite_tfc": "tfc:color_palettes/trims/uvarovite_tfc",
+				"nether_quartz_tfc": "tfc:color_palettes/trims/nether_quartz_tfc",
+				"certus_quartz_tfc": "tfc:color_palettes/trims/certus_quartz_tfc",
+				"quartzite_tfc": "tfc:color_palettes/trims/quartzite_tfc",
+				"realgar_tfc": "tfc:color_palettes/trims/realgar_tfc",
+				"malachite_tfc": "tfc:color_palettes/trims/malachite_tfc",
+				"glass_tfc": "tfc:color_palettes/trims/glass_tfc",
+				"olivine_tfc": "tfc:color_palettes/trims/olivine_tfc",
+				"opal_tfc": "tfc:color_palettes/trims/opal_tfc",
+				"amethyst_tfc": "tfc:color_palettes/trims/amethyst_tfc",
+				"lapis_tfc": "tfc:color_palettes/trims/lapis_tfc",
+				"apatite_tfc": "tfc:color_palettes/trims/apatite_tfc",
+				"red_garnet_tfc": "tfc:color_palettes/trims/red_garnet_tfc",
+				"yellow_garnet_tfc": "tfc:color_palettes/trims/yellow_garnet_tfc",
+				"monazite_tfc": "tfc:color_palettes/trims/monazite_tfc",
+				"rose_quartz_tfc": "tfc:color_palettes/trims/rose_quartz_tfc",
+				"fluix_tfc": "tfc:color_palettes/trims/fluix_tfc",
+				"silver_tfc": "tfc:color_palettes/trims/silver_tfc",
+				"sterling_silver_tfc": "tfc:color_palettes/trims/sterling_silver_tfc",
+				"gold_tfc": "tfc:color_palettes/trims/gold_tfc",
+				"rose_gold_tfc": "tfc:color_palettes/trims/rose_gold_tfc",
+				"nickel_tfc": "tfc:color_palettes/trims/nickel_tfc",
+				"platinum_tfc": "tfc:color_palettes/trims/platinum_tfc",
+				"titanium_tfc": "tfc:color_palettes/trims/titanium_tfc",
+				"bismuth_tfc": "tfc:color_palettes/trims/bismuth_tfc",
+				"neutronium_tfc": "tfc:color_palettes/trims/neutronium_tfc",
+				"pyrite_tfc": "tfc:color_palettes/trims/pyrite_tfc",
+				"redx_tfc": "tfc:color_palettes/trims/redx_tfc"
+			}
+		}
+	]
+}

kubejs/assets/minecraft/atlases/blocks.json

@@ -0,0 +1,68 @@
+{
+	"sources": [
+		{
+			"type": "paletted_permutations",
+			"textures": [
+				"trims/items/leggings_trim",
+				"trims/items/chestplate_trim",
+				"trims/items/helmet_trim",
+				"trims/items/boots_trim",
+				"tfc:item/helmet_trim",
+				"tfc:item/chestplate_trim",
+				"tfc:item/greaves_trim",
+				"tfc:item/boots_trim"
+			],
+			"palette_key": "trims/color_palettes/trim_palette",
+			"permutations": {
+				"almandine_tfc": "tfc:color_palettes/trims/almandine_tfc",
+				"andradite_tfc": "tfc:color_palettes/trims/andradite_tfc",
+				"blue_topaz_tfc": "tfc:color_palettes/trims/blue_topaz_tfc",
+				"cinnabar_tfc": "tfc:color_palettes/trims/cinnabar_tfc",
+				"coal_tfc": "tfc:color_palettes/trims/coal_tfc",
+				"diamond_tfc": "tfc:color_palettes/trims/diamond_tfc",
+				"emerald_tfc": "tfc:color_palettes/trims/emerald_tfc",
+				"green_sapphire_tfc": "tfc:color_palettes/trims/green_sapphire_tfc",
+				"grossular_tfc": "tfc:color_palettes/trims/grossular_tfc",
+				"rutile_tfc": "tfc:color_palettes/trims/rutile_tfc",
+				"lazurite_tfc": "tfc:color_palettes/trims/lazurite_tfc",
+				"pyrope_tfc": "tfc:color_palettes/trims/pyrope_tfc",
+				"rock_salt_tfc": "tfc:color_palettes/trims/rock_salt_tfc",
+				"ruby_tfc": "tfc:color_palettes/trims/ruby_tfc",
+				"salt_tfc": "tfc:color_palettes/trims/salt_tfc",
+				"sapphire_tfc": "tfc:color_palettes/trims/sapphire_tfc",
+				"sodalite_tfc": "tfc:color_palettes/trims/sodalite_tfc",
+				"coke_tfc": "tfc:color_palettes/trims/coke_tfc",
+				"spessartine_tfc": "tfc:color_palettes/trims/spessartine_tfc",
+				"topaz_tfc": "tfc:color_palettes/trims/topaz_tfc",
+				"uvarovite_tfc": "tfc:color_palettes/trims/uvarovite_tfc",
+				"nether_quartz_tfc": "tfc:color_palettes/trims/nether_quartz_tfc",
+				"certus_quartz_tfc": "tfc:color_palettes/trims/certus_quartz_tfc",
+				"quartzite_tfc": "tfc:color_palettes/trims/quartzite_tfc",
+				"realgar_tfc": "tfc:color_palettes/trims/realgar_tfc",
+				"malachite_tfc": "tfc:color_palettes/trims/malachite_tfc",
+				"glass_tfc": "tfc:color_palettes/trims/glass_tfc",
+				"olivine_tfc": "tfc:color_palettes/trims/olivine_tfc",
+				"opal_tfc": "tfc:color_palettes/trims/opal_tfc",
+				"amethyst_tfc": "tfc:color_palettes/trims/amethyst_tfc",
+				"lapis_tfc": "tfc:color_palettes/trims/lapis_tfc",
+				"apatite_tfc": "tfc:color_palettes/trims/apatite_tfc",
+				"red_garnet_tfc": "tfc:color_palettes/trims/red_garnet_tfc",
+				"yellow_garnet_tfc": "tfc:color_palettes/trims/yellow_garnet_tfc",
+				"monazite_tfc": "tfc:color_palettes/trims/monazite_tfc",
+				"rose_quartz_tfc": "tfc:color_palettes/trims/rose_quartz_tfc",
+				"fluix_tfc": "tfc:color_palettes/trims/fluix_tfc",
+				"silver_tfc": "tfc:color_palettes/trims/silver_tfc",
+				"sterling_silver_tfc": "tfc:color_palettes/trims/sterling_silver_tfc",
+				"gold_tfc": "tfc:color_palettes/trims/gold_tfc",
+				"rose_gold_tfc": "tfc:color_palettes/trims/rose_gold_tfc",
+				"nickel_tfc": "tfc:color_palettes/trims/nickel_tfc",
+				"platinum_tfc": "tfc:color_palettes/trims/platinum_tfc",
+				"titanium_tfc": "tfc:color_palettes/trims/titanium_tfc",
+				"bismuth_tfc": "tfc:color_palettes/trims/bismuth_tfc",
+				"neutronium_tfc": "tfc:color_palettes/trims/neutronium_tfc",
+				"pyrite_tfc": "tfc:color_palettes/trims/pyrite_tfc",
+				"redx_tfc": "tfc:color_palettes/trims/redx_tfc"
+			}
+		}
+	]
+}

kubejs/assets/tfg/lang/en_us.json

@@ -191,7 +191,20 @@
   "item.tfg.redblu_steel_hull_reinforcement": "Red & Blue Steel Hull Reinforcement",
   "item.tfg.aluminium_hull_reinforcement": "Aluminium Hull Reinforcement",
   "item.tfg.stainless_steel_hull_reinforcement": "Stainless Steel Hull Reinforcement",
-  "item.tfg.titanium_hull_reinforcement": "Titanium Hull Reinforcement",
+  "item.tfg.flint_arrow_head": "Flint Arrow Head",
+  "item.tfg.fletching": "Fletching",
+  "item.tfg.phantom_silk": "Phantom Silk",
+  "item.tfg.phantom_thread": "Phantom Thread",
+  "item.tfg.polycaprolactam_fabric": "Polycaprolactam Fabric",
+  "item.tfg.polycaprolactam_string": "Polycaprolactam String",
+  "item.tfg.fishing_net.wood": "Wood Fishing Net",
+  "item.tfg.fishing_net.brass": "Brass Fishing Net",
+  "item.tfg.fishing_net.rose_gold": "Rose Gold Fishing Net",
+  "item.tfg.fishing_net.sterling_silver": "Sterling Silver Fishing Net",
+  "item.tfg.fishing_net.invar": "Invar Fishing Net",
+  "item.tfg.fishing_net.cupronickel": "Cupronickel Fishing Net",
+  "item.tfg.fishing_net.tin_alloy": "Tin Alloy Fishing Net",
+  "item.tfg.fishing_net.magnalium": "Magnalium Fishing Net",
   "item.ulv_universal_circuit": "ULV Universal Circuit",
   "item.lv_universal_circuit": "LV Universal Circuit",
   "item.mv_universal_circuit": "MV Universal Circuit",

kubejs/assets/tfg/models/item/fishing_nets/brass_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/brass_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/cupronickel_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/cupronickel_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/invar_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/invar_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/magnalium_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/magnalium_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/rose_gold_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/rose_gold_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/sterling_silver_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/sterling_silver_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/tin_alloy_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/tin_alloy_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/fishing_nets/wood_fishing_net.json

@@ -0,0 +1,32 @@
+{
+	"credit": "Made with Blockbench",
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/fishing_nets/wood_fishing_net"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [-8, 90, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [100, -91, 56],
+			"translation": [0, 6.5, 2.25]
+		},
+		"firstperson_righthand": {
+			"rotation": [-77, -30, 34],
+			"translation": [0, 1.75, -6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [-69, 153, -36],
+			"translation": [0, 1.75, -6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0]
+		}
+	}
+}