Skip to content

Commit

Permalink
Revamp ninja weapons
Browse files Browse the repository at this point in the history
-Ninja weapons are no longer dropped by ninja turtles
-Adjusted ninja turtle textures
-Added crafting recipes for ninja weapons
-Added ninja weapon material and buffed silver weapon material durability
-Silver and ninja equipment are now repairable with ancient silver ingots
  • Loading branch information
IcarussOne committed Dec 31, 2023
1 parent 09d3565 commit 844fdc4
Show file tree
Hide file tree
Showing 10 changed files with 85 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import drzhark.mocreatures.entity.ai.EntityAIFollowOwnerPlayer;
import drzhark.mocreatures.entity.ai.EntityAIWanderMoC2;
import drzhark.mocreatures.entity.tameable.MoCEntityTameableAnimal;
import drzhark.mocreatures.init.MoCItems;
import drzhark.mocreatures.init.MoCLootTables;
import drzhark.mocreatures.init.MoCSoundEvents;
import net.minecraft.block.material.Material;
Expand All @@ -20,7 +19,6 @@
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.datasync.DataParameter;
Expand Down Expand Up @@ -350,31 +348,6 @@ protected ResourceLocation getLootTable() {
return MoCLootTables.TURTLE;
}

// TODO: Remove this after the weapons get reworked
@Override
protected Item getDropItem() {
if (MoCreatures.proxy.easterEggs) {
if (getPetName().equals("Donatello") || getPetName().equals("donatello")) {
return MoCItems.bo;
}

if (getPetName().equals("Leonardo") || getPetName().equals("leonardo")) {
return MoCItems.katana;
}

if (getPetName().equals("Rafael") || getPetName().equals("rafael") || getPetName().equals("raphael") || getPetName().equals("Raphael")) {
return MoCItems.sai;
}

if (getPetName().equals("Michelangelo") || getPetName().equals("michelangelo") || getPetName().equals("Michaelangelo")
|| getPetName().equals("michaelangelo")) {
return MoCItems.nunchaku;
}
}

return null;
}

/**
* Used to avoid rendering the top shell cube
*/
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/drzhark/mocreatures/init/MoCItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,15 @@ public class MoCItems {
public static final MoCItemFood venisonCooked = new MoCItemFood("venisoncooked", 8, 0.9F, true);
public static final MoCItemFood venisonRaw = new MoCItemFood("venisonraw", 3, 0.4F, true);
// Weapons
public static final MoCItemSword nunchaku = new MoCItemSword("nunchaku", Item.ToolMaterial.IRON);
public static final MoCItemSword sai = new MoCItemSword("sai", Item.ToolMaterial.IRON);
public static final MoCItemSword bo = new MoCItemSword("bo", Item.ToolMaterial.IRON);
public static final MoCItemSword katana = new MoCItemSword("katana", Item.ToolMaterial.IRON);
static ToolMaterial NINJA = EnumHelper.addToolMaterial("NINJA", 3, 501, 10.0F, 3.5F, 20).setRepairItem(new ItemStack(ancientSilverIngot));
public static final MoCItemSword nunchaku = new MoCItemSword("nunchaku", NINJA);
public static final MoCItemSword sai = new MoCItemSword("sai", NINJA);
public static final MoCItemSword bo = new MoCItemSword("bo", NINJA);
public static final MoCItemSword katana = new MoCItemSword("katana", NINJA);
static ToolMaterial SHARK = EnumHelper.addToolMaterial("SHARK", 1, 161, 7.0F, 2.5F, 15).setRepairItem(new ItemStack(sharkteeth));
public static final MoCItemSword sharksword = new MoCItemSword("sharksword", SHARK);
public static final MoCItemAxe sharkaxe = new MoCItemAxe("sharkaxe", SHARK, 9.5F, 1.0F);
static ToolMaterial SILVER = EnumHelper.addToolMaterial("SILVER", 2, 304, 9.5F, 3.0F, 19);
static ToolMaterial SILVER = EnumHelper.addToolMaterial("SILVER", 2, 404, 9.5F, 3.0F, 19).setRepairItem(new ItemStack(ancientSilverIngot));
public static final MoCItemSword silversword = new MoCItemSword("silversword", SILVER);
public static final MoCItemAxe silveraxe = new MoCItemAxe("silveraxe", SILVER, 10.0F, 1.1F);
static ToolMaterial SCORPC = EnumHelper.addToolMaterial("SCORPC", 2, 371, 7.5F, 2.5F, 16).setRepairItem(new ItemStack(chitinCave));
Expand Down
19 changes: 19 additions & 0 deletions src/main/resources/assets/mocreatures/recipes/nina_nunchaku.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "forge:ore_shaped",
"pattern": [
" SS",
"S S",
"H H"
],
"key": {
"S": {
"item": "mocreatures:ancientsilveringot"
},
"H": {
"item": "mocreatures:hide"
}
},
"result": {
"item": "mocreatures:nunchaku"
}
}
23 changes: 23 additions & 0 deletions src/main/resources/assets/mocreatures/recipes/ninja_bo_staff.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"type": "forge:ore_shaped",
"pattern": [
" W ",
"RSR",
" W "
],
"key": {
"S": {
"item": "mocreatures:ancientsilveringot"
},
"R": {
"item": "mocreatures:reptilehide"
},
"W": {
"type": "forge:ore_dict",
"ore": "logWood"
}
},
"result": {
"item": "mocreatures:bo"
}
}
19 changes: 19 additions & 0 deletions src/main/resources/assets/mocreatures/recipes/ninja_katana.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "forge:ore_shaped",
"pattern": [
" S ",
" S ",
"HSH"
],
"key": {
"S": {
"item": "mocreatures:ancientsilveringot"
},
"H": {
"item": "mocreatures:hide"
}
},
"result": {
"item": "mocreatures:katana"
}
}
18 changes: 18 additions & 0 deletions src/main/resources/assets/mocreatures/recipes/ninja_sai.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "forge:ore_shaped",
"pattern": [
"SSS",
"HSH"
],
"key": {
"S": {
"item": "mocreatures:ancientsilveringot"
},
"H": {
"item": "mocreatures:hide"
}
},
"result": {
"item": "mocreatures:sai"
}
}
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.

0 comments on commit 844fdc4

Please sign in to comment.