diff --git a/build.gradle b/build.gradle index a1d46f9a4..d97f1e061 100644 --- a/build.gradle +++ b/build.gradle @@ -36,13 +36,18 @@ minecraft { property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" } + data { property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" + + args '--mod', 'superbwarfare', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') } } } +sourceSets.main.resources { srcDir 'src/generated/resources' } + repositories { maven { url = "https://maven.theillusivec4.top/" diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 new file mode 100644 index 000000000..87a9bc139 --- /dev/null +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -0,0 +1,32 @@ +// 1.20.1 2024-09-09T20:11:17.4096685 Item Models: superbwarfare +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/bocek_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/devotion_blueprint.json +831ce33c5a4c90b71a42515f42f16d4c1a946c50 assets/superbwarfare/models/item/empty_perk.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_17_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_18_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hk_416_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hunting_rifle_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/marlin_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/minigun_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mk_14_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_1911_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_4_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_60_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_79_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_870_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_98b_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ntw_20_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/qbz_95_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sentinel_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sks_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/svd_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/taser_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/trachelium_blueprint.json +13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/vector_blueprint.json diff --git a/src/main/resources/assets/superbwarfare/models/item/aa_12_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/aa_12_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/aa_12_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/aa_12_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/aa_12_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/aa_12_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/ak_47_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/ak_47_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/ak_47_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/ak_47_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ak_47_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/ak_47_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/bocek_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/bocek_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/bocek_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/bocek_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/bocek_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/devotion_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/devotion_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/devotion_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/devotion_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/devotion_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/devotion_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/empty_perk.json b/src/generated/resources/assets/superbwarfare/models/item/empty_perk.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/empty_perk.json rename to src/generated/resources/assets/superbwarfare/models/item/empty_perk.json index ece63f8c0..d7bf2668e 100644 --- a/src/main/resources/assets/superbwarfare/models/item/empty_perk.json +++ b/src/generated/resources/assets/superbwarfare/models/item/empty_perk.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/perk/empty_perk" } diff --git a/src/main/resources/assets/superbwarfare/models/item/glock_17_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/glock_17_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/glock_17_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/glock_17_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/glock_17_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/glock_17_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/glock_18_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/glock_18_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/glock_18_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/glock_18_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/glock_18_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/glock_18_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/hk_416_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/hk_416_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/hk_416_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/hk_416_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hk_416_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/hk_416_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/hunting_rifle_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/hunting_rifle_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/javelin_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/javelin_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/javelin_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/javelin_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/javelin_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/k_98_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/k_98_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/k_98_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/k_98_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/k_98_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/k_98_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/m_1911_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m_1911_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/m_1911_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/m_1911_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_1911_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_1911_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/m_4_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m_4_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/m_4_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/m_4_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_4_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_4_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/m_60_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m_60_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/m_60_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/m_60_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_60_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_60_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/m_79_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m_79_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/m_79_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/m_79_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_79_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_79_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/m_870_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m_870_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/m_870_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/m_870_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_870_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_870_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/m_98b_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/m_98b_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/m_98b_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/m_98b_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_98b_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/m_98b_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/marlin_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/marlin_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/marlin_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/marlin_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/marlin_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/marlin_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/minigun_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/minigun_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/minigun_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/minigun_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/minigun_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/minigun_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mk_14_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/mk_14_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/mk_14_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/mk_14_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mk_14_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mk_14_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mosin_nagant_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/mosin_nagant_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/mosin_nagant_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/mosin_nagant_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mosin_nagant_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mosin_nagant_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/ntw_20_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/ntw_20_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/ntw_20_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/ntw_20_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ntw_20_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/ntw_20_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/qbz_95_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/qbz_95_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/qbz_95_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/qbz_95_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/qbz_95_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/qbz_95_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/rpg_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/rpg_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/rpg_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/rpg_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/rpg_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/rpg_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/rpk_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/rpk_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/rpk_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/rpk_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/rpk_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/rpk_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/sentinel_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/sentinel_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/sentinel_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/sentinel_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/sentinel_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/sentinel_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/sks_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/sks_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/sks_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/sks_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/sks_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/sks_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/svd_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/svd_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/svd_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/svd_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/svd_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/svd_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/taser_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/taser_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/taser_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/taser_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/taser_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/taser_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/trachelium_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/trachelium_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/trachelium_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/trachelium_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/trachelium_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/trachelium_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/resources/assets/superbwarfare/models/item/vector_blueprint.json b/src/generated/resources/assets/superbwarfare/models/item/vector_blueprint.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/vector_blueprint.json rename to src/generated/resources/assets/superbwarfare/models/item/vector_blueprint.json index a22e016de..7bbbd3bbb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/vector_blueprint.json +++ b/src/generated/resources/assets/superbwarfare/models/item/vector_blueprint.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/gun_blueprint" } diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java b/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java new file mode 100644 index 000000000..d537fd005 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java @@ -0,0 +1,31 @@ +package net.mcreator.superbwarfare.datagen; + +import net.mcreator.superbwarfare.ModUtils; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +import java.util.concurrent.CompletableFuture; + +@Mod.EventBusSubscriber(modid = ModUtils.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class DataGenerators { + + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + PackOutput packOutput = generator.getPackOutput(); + CompletableFuture lookupProvider = event.getLookupProvider(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + +// generator.addProvider(event.includeServer(), ModLootTableProvider.create(packOutput)); +// generator.addProvider(event.includeServer(), new ModWorldGenProvider(packOutput, lookupProvider)); +// generator.addProvider(event.includeServer(), new ModBlockStateProvider(packOutput, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModItemModelProvider(packOutput, existingFileHelper)); +// ModBlockTagProvider tagProvider = generator.addProvider(event.includeServer(), new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper)); +// generator.addProvider(event.includeServer(), new ModItemTagProvider(packOutput, lookupProvider, tagProvider.contentsGetter(), existingFileHelper)); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java new file mode 100644 index 000000000..08547d206 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java @@ -0,0 +1,82 @@ +package net.mcreator.superbwarfare.datagen; + +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModItems; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +@SuppressWarnings({"ConstantConditions", "UnusedReturnValue", "SameParameterValue", "unused"}) +public class ModItemModelProvider extends ItemModelProvider { + public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { + super(output, ModUtils.MODID, existingFileHelper); + } + + @Override + protected void registerModels() { + simpleItem(ModItems.EMPTY_PERK, "perk/"); + + // blueprints + blueprintItem(ModItems.TRACHELIUM_BLUEPRINT); + blueprintItem(ModItems.GLOCK_17_BLUEPRINT); + blueprintItem(ModItems.GLOCK_18_BLUEPRINT); + blueprintItem(ModItems.HUNTING_RIFLE_BLUEPRINT); + blueprintItem(ModItems.M_79_BLUEPRINT); + blueprintItem(ModItems.RPG_BLUEPRINT); + blueprintItem(ModItems.BOCEK_BLUEPRINT); + blueprintItem(ModItems.M_4_BLUEPRINT); + blueprintItem(ModItems.AA_12_BLUEPRINT); + blueprintItem(ModItems.HK_416_BLUEPRINT); + blueprintItem(ModItems.RPK_BLUEPRINT); + blueprintItem(ModItems.SKS_BLUEPRINT); + blueprintItem(ModItems.NTW_20_BLUEPRINT); + blueprintItem(ModItems.VECTOR_BLUEPRINT); + blueprintItem(ModItems.MINIGUN_BLUEPRINT); + blueprintItem(ModItems.MK_14_BLUEPRINT); + blueprintItem(ModItems.SENTINEL_BLUEPRINT); + blueprintItem(ModItems.M_60_BLUEPRINT); + blueprintItem(ModItems.SVD_BLUEPRINT); + blueprintItem(ModItems.MARLIN_BLUEPRINT); + blueprintItem(ModItems.M_870_BLUEPRINT); + blueprintItem(ModItems.M_98B_BLUEPRINT); + blueprintItem(ModItems.AK_47_BLUEPRINT); + blueprintItem(ModItems.DEVOTION_BLUEPRINT); + blueprintItem(ModItems.TASER_BLUEPRINT); + blueprintItem(ModItems.M_1911_BLUEPRINT); + blueprintItem(ModItems.QBZ_95_BLUEPRINT); + blueprintItem(ModItems.K_98_BLUEPRINT); + blueprintItem(ModItems.MOSIN_NAGANT_BLUEPRINT); + blueprintItem(ModItems.JAVELIN_BLUEPRINT); + } + + private ItemModelBuilder simpleItem(RegistryObject item) { + return simpleItem(item, ""); + } + + private ItemModelBuilder simpleItem(RegistryObject item, String location) { + return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")) + .texture("layer0", new ResourceLocation(ModUtils.MODID, "item/" + location + item.getId().getPath())); + } + + private ItemModelBuilder simpleItem(RegistryObject item, String location, String renderType) { + return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")) + .texture("layer0", new ResourceLocation(ModUtils.MODID, "item/" + location + item.getId().getPath())).renderType(renderType); + } + + public void evenSimplerBlockItem(RegistryObject block) { + this.withExistingParent(ModUtils.MODID + ":" + ForgeRegistries.BLOCKS.getKey(block.get()).getPath(), + modLoc("block/" + ForgeRegistries.BLOCKS.getKey(block.get()).getPath())); + } + + private ItemModelBuilder blueprintItem(RegistryObject item) { + return withExistingParent(item.getId().getPath(), new ResourceLocation("item/generated")) + .texture("layer0", new ResourceLocation(ModUtils.MODID, "item/gun_blueprint")); + } + +} diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json deleted file mode 100644 index ca0479a46..000000000 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/aa12.item.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 256, - 256 - ], - "display": { - "firstperson_righthand": { - "translation": [ - -4.75, - -2.75, - -4.5 - ], - "scale": [ - 2, - 2, - 2 - ] - }, - "firstperson_lefthand": { - "translation": [ - 8.75, - -61, - -21 - ], - "scale": [ - 0, - 0, - 0 - ] - }, - "gui": { - "rotation": [ - 165.69, - -39.63, - 178.66 - ], - "translation": [ - -2.4, - -4.75, - 0 - ], - "scale": [ - 0.21, - 0.21, - 0.21 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json deleted file mode 100644 index 4230a2743..000000000 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/abekiri.item.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 64, - 64 - ], - "gui_light": "front", - "display": { - "thirdperson_righthand": { - "translation": [ - 0, - 5.5, - -0.25 - ] - }, - "thirdperson_lefthand": { - "scale": [ - 0, - 0, - 0 - ] - }, - "firstperson_righthand": { - "translation": [ - -1.5, - -12.5, - -26.5 - ], - "scale": [ - 3, - 3, - 3 - ] - }, - "firstperson_lefthand": { - "scale": [ - 0, - 0, - 0 - ] - }, - "ground": { - "translation": [ - 0, - 4.25, - 0 - ], - "scale": [ - 1.2, - 1.2, - 1.2 - ] - }, - "gui": { - "rotation": [ - 90, - 45, - -90 - ], - "translation": [ - -5.75, - -1.5, - 0 - ], - "scale": [ - 1.6, - 1.6, - 1.6 - ] - }, - "head": { - "translation": [ - 0, - 23.75, - 0 - ], - "scale": [ - 3, - 3, - 3 - ] - }, - "fixed": { - "rotation": [ - 90, - -45, - 90 - ], - "translation": [ - -6.5, - 7.5, - 0 - ], - "scale": [ - 2, - 2, - 2 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json deleted file mode 100644 index 3f3b46bf2..000000000 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/ak47.item.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 128, - 128 - ], - "display": { - "firstperson_righthand": { - "translation": [ - -6.5, - 3.75, - 5 - ] - }, - "firstperson_lefthand": { - "scale": [ - 0, - 0, - 0 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json deleted file mode 100644 index e51b6ff0c..000000000 --- a/src/main/resources/assets/superbwarfare/models/displaysettings/bocek.item.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "builtin/entity", - "texture_size": [ - 64, - 64 - ], - "display": { - "firstperson_righthand": { - "translation": [ - -10.25, - -2.5, - -7.25 - ] - }, - "firstperson_lefthand": { - "translation": [ - -80, - -80, - -80 - ], - "scale": [ - 0, - 0, - 0 - ] - }, - "gui": { - "rotation": [ - 165.69, - -39.63, - 178.66 - ], - "translation": [ - 0.25, - -3.5, - 0 - ], - "scale": [ - 0.45, - 0.45, - 0.45 - ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json b/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json index fd3292bd0..adaac296a 100644 --- a/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/aa_12_base.json @@ -1,5 +1,53 @@ { - "parent": "superbwarfare:displaysettings/aa12.item", + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 256, + 256 + ], + "display": { + "firstperson_righthand": { + "translation": [ + -4.75, + -2.75, + -4.5 + ], + "scale": [ + 2, + 2, + 2 + ] + }, + "firstperson_lefthand": { + "translation": [ + 8.75, + -61, + -21 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "gui": { + "rotation": [ + 165.69, + -39.63, + 178.66 + ], + "translation": [ + -2.4, + -4.75, + 0 + ], + "scale": [ + 0.21, + 0.21, + 0.21 + ] + } + }, "textures": { "layer0": "superbwarfare:item/aa12_new" } diff --git a/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json b/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json index bf57be8bc..712d703b4 100644 --- a/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/abekiri_base.json @@ -1,5 +1,104 @@ { - "parent": "superbwarfare:displaysettings/abekiri.item", + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 64, + 64 + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [ + 0, + 5.5, + -0.25 + ] + }, + "thirdperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "firstperson_righthand": { + "translation": [ + -1.5, + -12.5, + -26.5 + ], + "scale": [ + 3, + 3, + 3 + ] + }, + "firstperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + }, + "ground": { + "translation": [ + 0, + 4.25, + 0 + ], + "scale": [ + 1.2, + 1.2, + 1.2 + ] + }, + "gui": { + "rotation": [ + 90, + 45, + -90 + ], + "translation": [ + -5.75, + -1.5, + 0 + ], + "scale": [ + 1.6, + 1.6, + 1.6 + ] + }, + "head": { + "translation": [ + 0, + 23.75, + 0 + ], + "scale": [ + 3, + 3, + 3 + ] + }, + "fixed": { + "rotation": [ + 90, + -45, + 90 + ], + "translation": [ + -6.5, + 7.5, + 0 + ], + "scale": [ + 2, + 2, + 2 + ] + } + }, "textures": { "layer0": "superbwarfare:item/abekiri" } diff --git a/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json b/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json index 509de9910..829ae5187 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/ak_47_base.json @@ -1,5 +1,26 @@ { - "parent": "superbwarfare:displaysettings/ak47.item", + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 128, + 128 + ], + "display": { + "firstperson_righthand": { + "translation": [ + -6.5, + 3.75, + 5 + ] + }, + "firstperson_lefthand": { + "scale": [ + 0, + 0, + 0 + ] + } + }, "textures": { "layer0": "superbwarfare:item/ak47" } diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek_base.json b/src/main/resources/assets/superbwarfare/models/item/bocek_base.json index 9dabcaa9a..77a162668 100644 --- a/src/main/resources/assets/superbwarfare/models/item/bocek_base.json +++ b/src/main/resources/assets/superbwarfare/models/item/bocek_base.json @@ -1,5 +1,48 @@ { - "parent": "superbwarfare:displaysettings/bocek.item", + "credit": "Made with Blockbench", + "parent": "builtin/entity", + "texture_size": [ + 64, + 64 + ], + "display": { + "firstperson_righthand": { + "translation": [ + -10.25, + -2.5, + -7.25 + ] + }, + "firstperson_lefthand": { + "translation": [ + -80, + -80, + -80 + ], + "scale": [ + 0, + 0, + 0 + ] + }, + "gui": { + "rotation": [ + 165.69, + -39.63, + 178.66 + ], + "translation": [ + 0.25, + -3.5, + 0 + ], + "scale": [ + 0.45, + 0.45, + 0.45 + ] + } + }, "textures": { "layer0": "superbwarfare:item/bocek" }