diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java index cfbaa08f..57da252c 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/creative/CreativeTabContents.java @@ -429,6 +429,7 @@ public final class CreativeTabContents { entry("portal_gun_atlas", "combat"), entry("portal_gun_p_body", "combat"), entry("portal_gun_craisin", "combat"), + entry("portal_gun_laynce", "combat"), entry("eye_of_the_storm", "combat"), entry("water_cannon", "combat"), entry("attitude_adjuster", "combat"), diff --git a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/portalgun/PortalGunVariant.java b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/portalgun/PortalGunVariant.java index 40d3c5ba..4c9f8953 100644 --- a/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/portalgun/PortalGunVariant.java +++ b/common-1.21.1/src/main/java/com/craisinlord/antarchy/content/portalgun/PortalGunVariant.java @@ -7,7 +7,8 @@ public enum PortalGunVariant { DEFAULT("", 0x40A0FF, 0xFF961E, "blue", "orange"), ATLAS("atlas", 0x53A6D0, 0x6A2BE0, "blue", "purple"), P_BODY("p_body", 0xF9D660, 0xC0282A, "yellow", "red"), - CRAISIN("craisin", 0x6A2BE0, 0xF9D660, "purple", "gold"); + CRAISIN("craisin", 0x6A2BE0, 0xF9D660, "purple", "gold"), + LAYNCE("laynce", 0xFF961E, 0x1FBF3A, "orange", "green"); private final String key; private final int blueColor; diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json index 9eaadb4e..6291c02e 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json @@ -674,6 +674,7 @@ "item.antarchy.portal_gun_atlas": "Atlas Portal Gun", "item.antarchy.portal_gun_p_body": "P-body Portal Gun", "item.antarchy.portal_gun_craisin": "Craisin Portal Gun", + "item.antarchy.portal_gun_laynce": "Laynce Portal Gun", "item.antarchy.diamond_minecart": "The Diamond Minecart", "item.antarchy.cogwheel_pet": "Cogwheel Pet", "item.antarchy.fire_dragon_pet": "Fire Dragon Pet", @@ -850,6 +851,7 @@ "tooltip.antarchy.portal_gun.color.yellow": "yellow", "tooltip.antarchy.portal_gun.color.red": "red", "tooltip.antarchy.portal_gun.color.gold": "gold", + "tooltip.antarchy.portal_gun.color.green": "green", "tooltip.antarchy.portal_gun.reset": "Sneak + use: fizzle your active portals.", "tooltip.antarchy.antimetal_inversion": "Inverts entites directly below it", "tooltip.antarchy.diamond_minecart.forward": "Will be implemented later.", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce_gui.json b/common-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce_gui.json new file mode 100644 index 00000000..28c83731 --- /dev/null +++ b/common-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce_gui.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "gui_light": "front", + "textures": { + "layer0": "antarchy:item/portal_gun/portal_gun_laynce_item" + } +} diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/entity/portal_gun/portal_laynce_blue_vortex.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/entity/portal_gun/portal_laynce_blue_vortex.png new file mode 100644 index 00000000..6649e933 Binary files /dev/null and b/common-1.21.1/src/main/resources/assets/antarchy/textures/entity/portal_gun/portal_laynce_blue_vortex.png differ diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/entity/portal_gun/portal_laynce_orange_vortex.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/entity/portal_gun/portal_laynce_orange_vortex.png new file mode 100644 index 00000000..e3e15f9e Binary files /dev/null and b/common-1.21.1/src/main/resources/assets/antarchy/textures/entity/portal_gun/portal_laynce_orange_vortex.png differ diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/gui/portal_gun_laynce_crosshair.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/gui/portal_gun_laynce_crosshair.png new file mode 100644 index 00000000..9ea060d5 Binary files /dev/null and b/common-1.21.1/src/main/resources/assets/antarchy/textures/gui/portal_gun_laynce_crosshair.png differ diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/item/portal_gun/portal_gun_laynce_item.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/item/portal_gun/portal_gun_laynce_item.png new file mode 100644 index 00000000..ffca8a6a Binary files /dev/null and b/common-1.21.1/src/main/resources/assets/antarchy/textures/item/portal_gun/portal_gun_laynce_item.png differ diff --git a/common-1.21.1/src/main/resources/assets/antarchy/textures/models/item/portal_gun_laynce.png b/common-1.21.1/src/main/resources/assets/antarchy/textures/models/item/portal_gun_laynce.png new file mode 100644 index 00000000..8f2a6d38 Binary files /dev/null and b/common-1.21.1/src/main/resources/assets/antarchy/textures/models/item/portal_gun_laynce.png differ diff --git a/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/undertrial_vault.json b/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/undertrial_vault.json index e13a824e..8df1eb89 100644 --- a/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/undertrial_vault.json +++ b/common-1.21.1/src/main/resources/data/antarchy/loot_table/chests/undertrial_vault.json @@ -129,6 +129,33 @@ "weight": 3 } ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "antarchy:portal_gun_atlas" + }, + { + "type": "minecraft:item", + "name": "antarchy:portal_gun_p_body" + }, + { + "type": "minecraft:item", + "name": "antarchy:portal_gun_craisin" + }, + { + "type": "minecraft:item", + "name": "antarchy:portal_gun_laynce" + } + ], + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.08 + } + ] } ], "random_sequence": "antarchy:chests/undertrial_vault" diff --git a/common-1.21.1/src/main/resources/data/antarchy/recipe/portal_gun_laynce.json b/common-1.21.1/src/main/resources/data/antarchy/recipe/portal_gun_laynce.json new file mode 100644 index 00000000..1f836fff --- /dev/null +++ b/common-1.21.1/src/main/resources/data/antarchy/recipe/portal_gun_laynce.json @@ -0,0 +1,19 @@ +{ + "type": "antarchy:portal_gun_variant", + "category": "equipment", + "ingredients": [ + { + "item": "antarchy:portal_gun" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:green_dye" + } + ], + "result": { + "id": "antarchy:portal_gun_laynce", + "count": 1 + } +} diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SeparateLargeItemModels.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SeparateLargeItemModels.java index 506e2835..12344969 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SeparateLargeItemModels.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/SeparateLargeItemModels.java @@ -23,6 +23,7 @@ public final class SeparateLargeItemModels { entry(AntarchyFabricItems.PORTAL_GUN_ATLAS.get(), "portal_gun_atlas_gui"), entry(AntarchyFabricItems.PORTAL_GUN_P_BODY.get(), "portal_gun_p_body_gui"), entry(AntarchyFabricItems.PORTAL_GUN_CRAISIN.get(), "portal_gun_craisin_gui"), + entry(AntarchyFabricItems.PORTAL_GUN_LAYNCE.get(), "portal_gun_laynce_gui"), entry(AntarchyFabricItems.ROYAL_ASSAILANT_BATTLEAXE.get(), "royal_assailant_battleaxe_gui"), entry(AntarchyFabricItems.ROYAL_ASSAILANT_STAFF.get(), "royal_assailant_staff_gui"), entry(AntarchyFabricItems.ROYAL_GUARDIAN_SWORD.get(), "royal_guardian_sword_gui"), diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java index f01e7b5c..0669d278 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricItems.java @@ -1594,6 +1594,16 @@ public final class AntarchyFabricItems { AntarchyFabricBlocks.PORTAL_GUN_PORTAL_BASE, com.craisinlord.antarchy.content.portalgun.PortalGunVariant.CRAISIN )); + public static final DeferredItem PORTAL_GUN_LAYNCE = ITEMS.register("portal_gun_laynce", + () -> new PortalGunItem( + new Item.Properties().stacksTo(1).durability(256).rarity(Rarity.RARE), + AntarchyFabricEntities.PORTAL_GUN_PORTAL, + AntarchyFabricEntities.PORTAL_GUN_BLACK_HOLE, + AntarchyFabricEntities.PORTAL_GUN_PROJECTILE, + AntarchyFabricBlocks.PORTAL_GUN_PORTAL_MASTER, + AntarchyFabricBlocks.PORTAL_GUN_PORTAL_BASE, + com.craisinlord.antarchy.content.portalgun.PortalGunVariant.LAYNCE + )); public static final DeferredItem EYE_OF_THE_STORM = ITEMS.register("eye_of_the_storm", () -> new EyeOfTheStormItem(new Item.Properties().stacksTo(1).durability(384).rarity(Rarity.EPIC))); diff --git a/fabric-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce.json b/fabric-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce.json new file mode 100644 index 00000000..a3b81466 --- /dev/null +++ b/fabric-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce.json @@ -0,0 +1,3 @@ +{ + "parent": "antarchy:item/portal_gun_held_geo" +} diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java index 4979b459..ea1f378e 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/client/AntarchyNeoForgeClient.java @@ -634,6 +634,7 @@ public final class AntarchyNeoForgeClient { registerGeoItemExtension(event, AntarchyNeoforgeItems.PORTAL_GUN_ATLAS.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); registerGeoItemExtension(event, AntarchyNeoforgeItems.PORTAL_GUN_P_BODY.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); registerGeoItemExtension(event, AntarchyNeoforgeItems.PORTAL_GUN_CRAISIN.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); + registerGeoItemExtension(event, AntarchyNeoforgeItems.PORTAL_GUN_LAYNCE.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); registerGeoItemExtension(event, AntarchyNeoforgeItems.SQUIDZOOKA.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); registerGeoItemExtension(event, AntarchyNeoforgeItems.RPO_LAUNCHER.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); registerGeoItemExtension(event, AntarchyNeoforgeItems.WATER_CANNON.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java index 46cf2b49..3a3ab907 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeItems.java @@ -1072,6 +1072,16 @@ public final class AntarchyNeoforgeItems { AntarchyNeoforgeBlocks.PORTAL_GUN_PORTAL_BASE, com.craisinlord.antarchy.content.portalgun.PortalGunVariant.CRAISIN )); + public static final DeferredItem PORTAL_GUN_LAYNCE = ITEMS.register("portal_gun_laynce", + () -> new PortalGunItem( + new Item.Properties().stacksTo(1).durability(256).rarity(Rarity.RARE), + AntarchyNeoforgeEntites.PORTAL_GUN_PORTAL, + AntarchyNeoforgeEntites.PORTAL_GUN_BLACK_HOLE, + AntarchyNeoforgeEntites.PORTAL_GUN_PROJECTILE, + AntarchyNeoforgeBlocks.PORTAL_GUN_PORTAL_MASTER, + AntarchyNeoforgeBlocks.PORTAL_GUN_PORTAL_BASE, + com.craisinlord.antarchy.content.portalgun.PortalGunVariant.LAYNCE + )); public static final DeferredItem EYE_OF_THE_STORM = ITEMS.register("eye_of_the_storm", () -> new EyeOfTheStormItem(new Item.Properties().stacksTo(1).durability(384).rarity(Rarity.EPIC))); public static final DeferredItem SQUIDZOOKA = ITEMS.register("squidzooka", diff --git a/neoforge-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce.json b/neoforge-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce.json new file mode 100644 index 00000000..db8e0d5a --- /dev/null +++ b/neoforge-1.21.1/src/main/resources/assets/antarchy/models/item/portal_gun_laynce.json @@ -0,0 +1,18 @@ +{ + "loader": "neoforge:separate_transforms", + "gui_light": "front", + "base": { + "parent": "antarchy:item/portal_gun_held_geo" + }, + "perspectives": { + "gui": { + "parent": "antarchy:item/portal_gun_laynce_gui" + }, + "ground": { + "parent": "antarchy:item/portal_gun_laynce_gui" + }, + "fixed": { + "parent": "antarchy:item/portal_gun_laynce_gui" + } + } +}