diff --git a/build.gradle b/build.gradle index 7f2b941..6f94a77 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = "1.1.3" +version = "1.1.4" group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "tinkersaether" diff --git a/src/main/java/shnupbups/tinkersaether/TinkersAether.java b/src/main/java/shnupbups/tinkersaether/TinkersAether.java index f2a48d5..13741d9 100644 --- a/src/main/java/shnupbups/tinkersaether/TinkersAether.java +++ b/src/main/java/shnupbups/tinkersaether/TinkersAether.java @@ -31,7 +31,7 @@ public class TinkersAether { public static final String modid = "tinkersaether"; public static final String name = "Tinkers Aether"; - public static final String version = "1.1.3"; + public static final String version = "1.1.4"; @Mod.Instance(modid) public static TinkersAether instance; diff --git a/src/main/java/shnupbups/tinkersaether/blocks/TABlock.java b/src/main/java/shnupbups/tinkersaether/blocks/TABlock.java index 73b5096..98bf67d 100644 --- a/src/main/java/shnupbups/tinkersaether/blocks/TABlock.java +++ b/src/main/java/shnupbups/tinkersaether/blocks/TABlock.java @@ -3,14 +3,28 @@ import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import shnupbups.tinkersaether.TinkersAether; public class TABlock extends Block { + private boolean beaconBase = false; + public TABlock(String name, Material material) { super(material); this.setUnlocalizedName(name); this.setRegistryName(TinkersAether.modid, name); this.setCreativeTab(AetherCreativeTabs.blocks); } + + @Override + public boolean isBeaconBase(IBlockAccess world, BlockPos pos, BlockPos beacon) { + return beaconBase; + } + + public TABlock setBeaconBase() { + this.beaconBase = true; + return this; + } } diff --git a/src/main/java/shnupbups/tinkersaether/items/TAItem.java b/src/main/java/shnupbups/tinkersaether/items/TAItem.java index 5fab8a5..c8d9b0b 100644 --- a/src/main/java/shnupbups/tinkersaether/items/TAItem.java +++ b/src/main/java/shnupbups/tinkersaether/items/TAItem.java @@ -2,14 +2,27 @@ import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import shnupbups.tinkersaether.TinkersAether; public class TAItem extends Item { + private boolean beaconPayment = false; + public TAItem(String name) { super(); this.setUnlocalizedName(name); this.setRegistryName(TinkersAether.modid, name); this.setCreativeTab(AetherCreativeTabs.material); } + + @Override + public boolean isBeaconPayment(ItemStack stack) { + return beaconPayment; + } + + public TAItem setBeaconPayment() { + this.beaconPayment = true; + return this; + } } diff --git a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java index 390e273..24a6a23 100644 --- a/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java +++ b/src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java @@ -48,9 +48,9 @@ public ModuleBase() { public static final Material aercloudCold = Materials.mat("aercloudCold", 0xAAAAAA); public static final Material aercloudGold = Materials.mat("aercloudGold", 0xFFF1A1); - public static final TAItem valkyrieIngot = new TAItem("valkyrie_ingot"); + public static final TAItem valkyrieIngot = new TAItem("valkyrie_ingot").setBeaconPayment(); public static final TAItem valkyrieNugget = new TAItem("valkyrie_nugget"); - public static final TABlock valkyrieBlock = new TABlock("valkyrie_block", net.minecraft.block.material.Material.IRON); + public static final TABlock valkyrieBlock = new TABlock("valkyrie_block", net.minecraft.block.material.Material.IRON).setBeaconBase(); public static final TAItem swetCrystal = new TAItem("swet_crystal"); diff --git a/src/main/java/shnupbups/tinkersaether/modules/ModuleTools.java b/src/main/java/shnupbups/tinkersaether/modules/ModuleTools.java index fe0a230..c711ce3 100644 --- a/src/main/java/shnupbups/tinkersaether/modules/ModuleTools.java +++ b/src/main/java/shnupbups/tinkersaether/modules/ModuleTools.java @@ -2,6 +2,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -11,11 +12,13 @@ import shnupbups.tinkersaether.tools.ToolDartShooter; import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.library.materials.Material; +import slimeknights.tconstruct.library.modifiers.IModifier; import slimeknights.tconstruct.library.tinkering.PartMaterialType; import slimeknights.tconstruct.library.tools.IToolPart; import slimeknights.tconstruct.library.tools.Pattern; import slimeknights.tconstruct.library.tools.ToolCore; import slimeknights.tconstruct.library.tools.ToolPart; +import slimeknights.tconstruct.tools.TinkerModifiers; import slimeknights.tconstruct.tools.TinkerTools; import java.util.ArrayList; @@ -93,13 +96,14 @@ public static void registerItems(RegistryEvent.Register event) { TinkersAether.logger.info("Tools Module - Stencil Crafting Registered"); - /*// for dart shooter - // TODO add modifier jsons + // for darts and dart shooters for (IModifier modifier: new IModifier[] { TinkerModifiers.modBaneOfArthopods, TinkerModifiers.modBeheading, TinkerModifiers.modDiamond, TinkerModifiers.modEmerald, + TinkerModifiers.modFiery, + TinkerModifiers.modFins, TinkerModifiers.modGlowing, TinkerModifiers.modHaste, TinkerModifiers.modKnockback, @@ -118,7 +122,7 @@ public static void registerItems(RegistryEvent.Register event) { new ResourceLocation(TinkersAether.modid, "models/item/modifiers/"+modifier.getIdentifier())); } - TinkersAether.logger.info("Tools Module - Modifier Models Registered");*/ + TinkersAether.logger.info("Tools Module - Modifier Models Registered"); TinkersAether.logger.info("Tools Module - End ItemInit"); } diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/bane_of_arthopods.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/bane_of_arthopods.json new file mode 100644 index 0000000..1924be9 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/bane_of_arthopods.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_bane_spider", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_bane_spider" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/beheading.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/beheading.json new file mode 100644 index 0000000..48cd8c5 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/beheading.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_beheading", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_beheading" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/diamond.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/diamond.json new file mode 100644 index 0000000..fe1dab5 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/diamond.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_diamond", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_diamond" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/emerald.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/emerald.json new file mode 100644 index 0000000..2d26a73 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/emerald.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_emerald", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_emerald" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/fiery.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/fiery.json new file mode 100644 index 0000000..1f26818 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/fiery.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_fiery", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_fiery" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/fins.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/fins.json new file mode 100644 index 0000000..17ab9c8 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/fins.json @@ -0,0 +1,5 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_fins" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/glowing.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/glowing.json new file mode 100644 index 0000000..6fac561 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/glowing.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_glowing", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_glowing" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/haste.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/haste.json new file mode 100644 index 0000000..80d2e30 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/haste.json @@ -0,0 +1,5 @@ +{ + "textures": { + "dart_shooter": "tinkersaether:items/dart_shooter/mod_haste" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/knockback.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/knockback.json new file mode 100644 index 0000000..3728a55 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/knockback.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_knockback", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_knockback" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/luck.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/luck.json new file mode 100644 index 0000000..26e61e2 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/luck.json @@ -0,0 +1,5 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_luck" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/mending_moss.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/mending_moss.json new file mode 100644 index 0000000..3247a94 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/mending_moss.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_mending_moss", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_mending_moss" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/necrotic.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/necrotic.json new file mode 100644 index 0000000..6e2a3d4 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/necrotic.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_necrotic", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_necrotic" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/reinforced.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/reinforced.json new file mode 100644 index 0000000..1e5a111 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/reinforced.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_reinforced", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_reinforced" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/sharpness.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/sharpness.json new file mode 100644 index 0000000..f37c8f3 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/sharpness.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_sharpness", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_sharpness" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/shulking.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/shulking.json new file mode 100644 index 0000000..0242f72 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/shulking.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_shulking", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_shulking" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/silktouch.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/silktouch.json new file mode 100644 index 0000000..3ef6985 --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/silktouch.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_silk", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_silk" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/smite.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/smite.json new file mode 100644 index 0000000..63684bc --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/smite.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_smite", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_smite" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/soulbound.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/soulbound.json new file mode 100644 index 0000000..daf3edf --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/soulbound.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_soulbound", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_soulbound" + } +} diff --git a/src/main/resources/assets/tinkersaether/models/item/modifiers/webbed.json b/src/main/resources/assets/tinkersaether/models/item/modifiers/webbed.json new file mode 100644 index 0000000..2e90fbd --- /dev/null +++ b/src/main/resources/assets/tinkersaether/models/item/modifiers/webbed.json @@ -0,0 +1,6 @@ +{ + "textures": { + "dart": "tinkersaether:items/dart/mod_web", + "dart_shooter": "tinkersaether:items/dart_shooter/mod_web" + } +} diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_beheading.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_beheading.png new file mode 100644 index 0000000..c4b2fb8 Binary files /dev/null and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_beheading.png differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_emerald.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_emerald.png index e02c412..e4fba24 100644 Binary files a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_emerald.png and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_emerald.png differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_glowing.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_glowing.png new file mode 100644 index 0000000..8c8b79c Binary files /dev/null and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_glowing.png differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_haste.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_haste.png new file mode 100644 index 0000000..c3db574 Binary files /dev/null and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_haste.png differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_knockback.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_knockback.png new file mode 100644 index 0000000..fa5d1bd Binary files /dev/null and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_knockback.png differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_luck.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_luck.png deleted file mode 100644 index 6dfb9f1..0000000 Binary files a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_luck.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_mending_moss.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_mending_moss.png new file mode 100644 index 0000000..cc7b807 Binary files /dev/null and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_mending_moss.png differ diff --git a/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_necrotic.png b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_necrotic.png new file mode 100644 index 0000000..bd57461 Binary files /dev/null and b/src/main/resources/assets/tinkersaether/textures/items/dart_shooter/mod_necrotic.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 501b42a..5b90b9a 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "tinkersaether", "name": "Tinker's Aether", "description": "Adds Aether materials and stuff to Tinker's Construct.", - "version": "1.1.3", + "version": "1.1.4", "mcversion": "${mcversion}", "url": "", "updateUrl": "",