Skip to content

Commit

Permalink
v1.0.4
Browse files Browse the repository at this point in the history
Modifiers now alter the appearance of Darts and Dart Shooters, as with
other Tinker's tools.
Valkyrie Metal Blocks can now be used in Beacon Bases, and Valkyrie
Metal Ingots can now be used to activate a Beacon.
  • Loading branch information
Shnupbups committed Jul 13, 2018
1 parent 62d5b6c commit 8630c13
Show file tree
Hide file tree
Showing 34 changed files with 150 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/shnupbups/tinkersaether/TinkersAether.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/shnupbups/tinkersaether/blocks/TABlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
13 changes: 13 additions & 0 deletions src/main/java/shnupbups/tinkersaether/items/TAItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
4 changes: 2 additions & 2 deletions src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
10 changes: 7 additions & 3 deletions src/main/java/shnupbups/tinkersaether/modules/ModuleTools.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -93,13 +96,14 @@ public static void registerItems(RegistryEvent.Register<Item> 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,
Expand All @@ -118,7 +122,7 @@ public static void registerItems(RegistryEvent.Register<Item> 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");
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_bane_spider",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_bane_spider"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_beheading",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_beheading"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_diamond",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_diamond"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_emerald",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_emerald"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_fiery",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_fiery"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_fins"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_glowing",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_glowing"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"dart_shooter": "tinkersaether:items/dart_shooter/mod_haste"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_knockback",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_knockback"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_luck"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_mending_moss",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_mending_moss"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_necrotic",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_necrotic"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_reinforced",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_reinforced"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_sharpness",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_sharpness"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_shulking",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_shulking"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_silk",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_silk"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_smite",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_smite"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_soulbound",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_soulbound"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"textures": {
"dart": "tinkersaether:items/dart/mod_web",
"dart_shooter": "tinkersaether:items/dart_shooter/mod_web"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -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": "",
Expand Down

1 comment on commit 8630c13

@Shnupbups
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit should be called v1.1.4, not v1.0.4. Whoops!

Please sign in to comment.