Skip to content

Commit 8630c13

Browse files
committed
v1.0.4
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.
1 parent 62d5b6c commit 8630c13

34 files changed

+150
-8
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
1111
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
1212

1313

14-
version = "1.1.3"
14+
version = "1.1.4"
1515
group = "shnupbups.tinkersaether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
1616
archivesBaseName = "tinkersaether"
1717

src/main/java/shnupbups/tinkersaether/TinkersAether.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class TinkersAether {
3232
public static final String modid = "tinkersaether";
3333
public static final String name = "Tinkers Aether";
34-
public static final String version = "1.1.3";
34+
public static final String version = "1.1.4";
3535

3636
@Mod.Instance(modid)
3737
public static TinkersAether instance;

src/main/java/shnupbups/tinkersaether/blocks/TABlock.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,28 @@
33
import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
44
import net.minecraft.block.Block;
55
import net.minecraft.block.material.Material;
6+
import net.minecraft.util.math.BlockPos;
7+
import net.minecraft.world.IBlockAccess;
68
import shnupbups.tinkersaether.TinkersAether;
79

810
public class TABlock extends Block {
911

12+
private boolean beaconBase = false;
13+
1014
public TABlock(String name, Material material) {
1115
super(material);
1216
this.setUnlocalizedName(name);
1317
this.setRegistryName(TinkersAether.modid, name);
1418
this.setCreativeTab(AetherCreativeTabs.blocks);
1519
}
20+
21+
@Override
22+
public boolean isBeaconBase(IBlockAccess world, BlockPos pos, BlockPos beacon) {
23+
return beaconBase;
24+
}
25+
26+
public TABlock setBeaconBase() {
27+
this.beaconBase = true;
28+
return this;
29+
}
1630
}

src/main/java/shnupbups/tinkersaether/items/TAItem.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,27 @@
22

33
import com.legacy.aether.registry.creative_tabs.AetherCreativeTabs;
44
import net.minecraft.item.Item;
5+
import net.minecraft.item.ItemStack;
56
import shnupbups.tinkersaether.TinkersAether;
67

78
public class TAItem extends Item {
89

10+
private boolean beaconPayment = false;
11+
912
public TAItem(String name) {
1013
super();
1114
this.setUnlocalizedName(name);
1215
this.setRegistryName(TinkersAether.modid, name);
1316
this.setCreativeTab(AetherCreativeTabs.material);
1417
}
18+
19+
@Override
20+
public boolean isBeaconPayment(ItemStack stack) {
21+
return beaconPayment;
22+
}
23+
24+
public TAItem setBeaconPayment() {
25+
this.beaconPayment = true;
26+
return this;
27+
}
1528
}

src/main/java/shnupbups/tinkersaether/modules/ModuleBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public ModuleBase() {
4848
public static final Material aercloudCold = Materials.mat("aercloudCold", 0xAAAAAA);
4949
public static final Material aercloudGold = Materials.mat("aercloudGold", 0xFFF1A1);
5050

51-
public static final TAItem valkyrieIngot = new TAItem("valkyrie_ingot");
51+
public static final TAItem valkyrieIngot = new TAItem("valkyrie_ingot").setBeaconPayment();
5252
public static final TAItem valkyrieNugget = new TAItem("valkyrie_nugget");
53-
public static final TABlock valkyrieBlock = new TABlock("valkyrie_block", net.minecraft.block.material.Material.IRON);
53+
public static final TABlock valkyrieBlock = new TABlock("valkyrie_block", net.minecraft.block.material.Material.IRON).setBeaconBase();
5454

5555
public static final TAItem swetCrystal = new TAItem("swet_crystal");
5656

src/main/java/shnupbups/tinkersaether/modules/ModuleTools.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.minecraft.item.Item;
44
import net.minecraft.item.ItemStack;
5+
import net.minecraft.util.ResourceLocation;
56
import net.minecraftforge.event.RegistryEvent;
67
import net.minecraftforge.fml.common.Mod;
78
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -11,11 +12,13 @@
1112
import shnupbups.tinkersaether.tools.ToolDartShooter;
1213
import slimeknights.tconstruct.library.TinkerRegistry;
1314
import slimeknights.tconstruct.library.materials.Material;
15+
import slimeknights.tconstruct.library.modifiers.IModifier;
1416
import slimeknights.tconstruct.library.tinkering.PartMaterialType;
1517
import slimeknights.tconstruct.library.tools.IToolPart;
1618
import slimeknights.tconstruct.library.tools.Pattern;
1719
import slimeknights.tconstruct.library.tools.ToolCore;
1820
import slimeknights.tconstruct.library.tools.ToolPart;
21+
import slimeknights.tconstruct.tools.TinkerModifiers;
1922
import slimeknights.tconstruct.tools.TinkerTools;
2023

2124
import java.util.ArrayList;
@@ -93,13 +96,14 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
9396

9497
TinkersAether.logger.info("Tools Module - Stencil Crafting Registered");
9598

96-
/*// for dart shooter
97-
// TODO add modifier jsons
99+
// for darts and dart shooters
98100
for (IModifier modifier: new IModifier[] {
99101
TinkerModifiers.modBaneOfArthopods,
100102
TinkerModifiers.modBeheading,
101103
TinkerModifiers.modDiamond,
102104
TinkerModifiers.modEmerald,
105+
TinkerModifiers.modFiery,
106+
TinkerModifiers.modFins,
103107
TinkerModifiers.modGlowing,
104108
TinkerModifiers.modHaste,
105109
TinkerModifiers.modKnockback,
@@ -118,7 +122,7 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
118122
new ResourceLocation(TinkersAether.modid, "models/item/modifiers/"+modifier.getIdentifier()));
119123
}
120124

121-
TinkersAether.logger.info("Tools Module - Modifier Models Registered");*/
125+
TinkersAether.logger.info("Tools Module - Modifier Models Registered");
122126

123127
TinkersAether.logger.info("Tools Module - End ItemInit");
124128
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"textures": {
3+
"dart": "tinkersaether:items/dart/mod_bane_spider",
4+
"dart_shooter": "tinkersaether:items/dart_shooter/mod_bane_spider"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"textures": {
3+
"dart": "tinkersaether:items/dart/mod_beheading",
4+
"dart_shooter": "tinkersaether:items/dart_shooter/mod_beheading"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"textures": {
3+
"dart": "tinkersaether:items/dart/mod_diamond",
4+
"dart_shooter": "tinkersaether:items/dart_shooter/mod_diamond"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"textures": {
3+
"dart": "tinkersaether:items/dart/mod_emerald",
4+
"dart_shooter": "tinkersaether:items/dart_shooter/mod_emerald"
5+
}
6+
}

0 commit comments

Comments
 (0)