Add proper Holzstammhuhn drops

Will der mich trollen?!

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 = "RC8"
+version = "1.8.1"
 group = "mod.acgaming.spackenmobs" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Spackenmobs-1.12.2"
 

src/main/java/mod/acgaming/spackenmobs/Spackenmobs.java

@@ -16,7 +16,7 @@ import mod.acgaming.spackenmobs.misc.ModEntities;
 public class Spackenmobs
 {
     public static final String MODID = "spackenmobs";
-    public static final String VERSION = "RC8";
+    public static final String VERSION = "1.8.1";
 
     public static final CreativeTabs SPACKENMOBS_TAB = new SpackenmobsTab();
 

src/main/java/mod/acgaming/spackenmobs/entities/EntityHolzstammhuhn.java

@@ -14,10 +14,13 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.pathfinding.PathNodeType;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import mod.acgaming.spackenmobs.misc.ModLootTableList;
+
 public class EntityHolzstammhuhn extends EntityChicken
 {
     private static final Set<Item> TEMPTATION_ITEMS = Sets.newHashSet(Items.STICK);
@@ -67,6 +70,12 @@ public class EntityHolzstammhuhn extends EntityChicken
         this.playSound(SoundEvents.BLOCK_WOOD_STEP, 0.15F, 1.0F);
     }
 
+    @Override
+    protected ResourceLocation getLootTable()
+    {
+        return ModLootTableList.ENTITIES_HOLZSTAMMHUHN;
+    }
+
     @Override
     public EntityHolzstammhuhn createChild(EntityAgeable ageable)
     {

src/main/java/mod/acgaming/spackenmobs/entities/EntityMZTEWolf.java

@@ -2,7 +2,6 @@ package mod.acgaming.spackenmobs.entities;
 
 import java.util.UUID;
 
-import mod.acgaming.spackenmobs.misc.ModSoundEvents;
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.monster.EntityCreeper;
@@ -11,9 +10,12 @@ import net.minecraft.entity.passive.AbstractHorse;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityWolf;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.DamageSource;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.world.World;
 
+import mod.acgaming.spackenmobs.misc.ModSoundEvents;
+
 public class EntityMZTEWolf extends EntityWolf
 {
     public EntityMZTEWolf(World worldIn)
@@ -29,6 +31,24 @@ public class EntityMZTEWolf extends EntityWolf
         return ModSoundEvents.ENTITY_MZTEWOLF_AMBIENT;
     }
 
+    @Override
+    protected SoundEvent getHurtSound(DamageSource damageSourceIn)
+    {
+        return ModSoundEvents.ENTITY_MZTEWOLF_HURT;
+    }
+
+    @Override
+    protected SoundEvent getDeathSound()
+    {
+        return ModSoundEvents.ENTITY_MZTEWOLF_DEATH;
+    }
+
+    @Override
+    protected float getSoundVolume()
+    {
+        return 1.0F;
+    }
+
     @Override
     public EntityMZTEWolf createChild(EntityAgeable ageable)
     {
@@ -93,8 +113,7 @@ public class EntityMZTEWolf extends EntityWolf
                 }
             }
 
-            if (target instanceof EntityPlayer && owner instanceof EntityPlayer
-                && !((EntityPlayer) owner).canAttackPlayer((EntityPlayer) target))
+            if (target instanceof EntityPlayer && owner instanceof EntityPlayer && !((EntityPlayer) owner).canAttackPlayer((EntityPlayer) target))
             {
                 return false;
             }

src/main/java/mod/acgaming/spackenmobs/entities/EntityMarcellDAvis.java

@@ -2,9 +2,11 @@ package mod.acgaming.spackenmobs.entities;
 
 import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.world.World;
 
+import mod.acgaming.spackenmobs.misc.ModLootTableList;
 import mod.acgaming.spackenmobs.misc.ModSoundEvents;
 
 public class EntityMarcellDAvis extends EntityZombie
@@ -32,4 +34,10 @@ public class EntityMarcellDAvis extends EntityZombie
     {
         return ModSoundEvents.ENTITY_MARCELLDAVIS_DEATH;
     }
+
+    @Override
+    protected ResourceLocation getLootTable()
+    {
+        return ModLootTableList.ENTITIES_MARCELL_DAVIS;
+    }
 }

src/main/java/mod/acgaming/spackenmobs/misc/ModItems.java

@@ -15,9 +15,10 @@ public class ModItems
 {
     public static final List<Item> ITEMS = new ArrayList<>();
 
+    public static final Item AHOJ_BRAUSE = new ModItemFoodEffect("ahoj_brause", 2, 0.15F, false, new PotionEffect(MobEffects.SPEED, 200, 5, false, true));
+    public static final Item AHOJ_BRAUSE_DRINK = new ModItemFoodDrink("ahoj_brause_drink", 4, 0.3F, false, new PotionEffect(MobEffects.SPEED, 400, 10, false, true));
+    public static final Item MODEM = new ModItemBase("modem");
     public static final Item RAM = new ModItemBase("ram");
     public static final Item RAM_ON_A_STICK = new ModItemBase("ram_on_a_stick");
     public static final Item SURSTROEMMING = new ModItemBase("surstroemming");
-    public static final Item AHOJ_BRAUSE = new ModItemFoodEffect("ahoj_brause", 2, 0.15F, false, new PotionEffect(MobEffects.SPEED, 200, 5, false, true));
-    public static final Item AHOJ_BRAUSE_DRINK = new ModItemFoodDrink("ahoj_brause_drink", 4, 0.3F, false, new PotionEffect(MobEffects.SPEED, 400, 10, false, true));
 }

src/main/java/mod/acgaming/spackenmobs/misc/ModLootTableList.java

@@ -12,8 +12,10 @@ public class ModLootTableList
 {
     private static final Set<ResourceLocation> LOOT_TABLES = Sets.newHashSet();
     public static final ResourceLocation EMPTY = register("empty");
-    public static final ResourceLocation ENTITIES_JENS = register("entities/jens");
     public static final ResourceLocation ENTITIES_FRIEDRICH = register("entities/friedrich");
+    public static final ResourceLocation ENTITIES_HOLZSTAMMHUHN = register("entities/holzstammhuhn");
+    public static final ResourceLocation ENTITIES_JENS = register("entities/jens");
+    public static final ResourceLocation ENTITIES_MARCELL_DAVIS = register("entities/marcell_davis");
     private static final Set<ResourceLocation> READ_ONLY_LOOT_TABLES = Collections.unmodifiableSet(LOOT_TABLES);
 
     public static Set<ResourceLocation> getAll()

src/main/java/mod/acgaming/spackenmobs/misc/ModSoundEvents.java

@@ -56,6 +56,8 @@ public class ModSoundEvents
 
     public static final SoundEvent ENTITY_GISELA_AMBIENT = new SoundEvent(new ResourceLocation("spackenmobs:entities.gisela.ambient"));
     public static final SoundEvent ENTITY_GISELA_HURT = new SoundEvent(new ResourceLocation("spackenmobs:entities.gisela.hurt"));
-    
+
     public static final SoundEvent ENTITY_MZTEWOLF_AMBIENT = new SoundEvent(new ResourceLocation("spackenmobs:entities.mztewolf.ambient"));
+    public static final SoundEvent ENTITY_MZTEWOLF_HURT = new SoundEvent(new ResourceLocation("spackenmobs:entities.mztewolf.hurt"));
+    public static final SoundEvent ENTITY_MZTEWOLF_DEATH = new SoundEvent(new ResourceLocation("spackenmobs:entities.mztewolf.death"));
 }

src/main/java/mod/acgaming/spackenmobs/misc/RegistryHandler.java

@@ -15,6 +15,7 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.EntityEntry;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
+import net.minecraftforge.oredict.OreDictionary;
 
 import mod.acgaming.spackenmobs.Spackenmobs;
 import mod.acgaming.spackenmobs.entities.*;
@@ -224,6 +225,9 @@ public class RegistryHandler
     public static void registerItems(Register<Item> event)
     {
         event.getRegistry().registerAll(ModItems.ITEMS.toArray(new Item[0]));
+
+        OreDictionary.registerOre("dustRedstone", ModItems.MODEM);
+        OreDictionary.registerOre("ingotIron", ModItems.RAM);
     }
 
     @SubscribeEvent
@@ -325,8 +329,12 @@ public class RegistryHandler
         ModSoundEvents.ENTITY_GISELA_HURT.setRegistryName(new ResourceLocation("spackenmobs:entities.gisela.hurt"));
         event.getRegistry().register(ModSoundEvents.ENTITY_GISELA_HURT);
 
-	    //MZTEWolf
-	    ModSoundEvents.ENTITY_MZTEWOLF_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.mztewolf.ambient"));
-	    event.getRegistry().register(ModSoundEvents.ENTITY_MZTEWOLF_AMBIENT);
+        //MZTEWolf
+        ModSoundEvents.ENTITY_MZTEWOLF_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.mztewolf.ambient"));
+        event.getRegistry().register(ModSoundEvents.ENTITY_MZTEWOLF_AMBIENT);
+        ModSoundEvents.ENTITY_MZTEWOLF_HURT.setRegistryName(new ResourceLocation("spackenmobs:entities.mztewolf.hurt"));
+        event.getRegistry().register(ModSoundEvents.ENTITY_MZTEWOLF_HURT);
+        ModSoundEvents.ENTITY_MZTEWOLF_DEATH.setRegistryName(new ResourceLocation("spackenmobs:entities.mztewolf.death"));
+        event.getRegistry().register(ModSoundEvents.ENTITY_MZTEWOLF_DEATH);
     }
 }

src/main/java/mod/acgaming/spackenmobs/misc/RegistryHandlerClient.java

@@ -16,11 +16,12 @@ public class RegistryHandlerClient
     @SubscribeEvent
     public static void registerModels(ModelRegistryEvent event)
     {
+        registerModel(ModItems.AHOJ_BRAUSE, 0);
+        registerModel(ModItems.AHOJ_BRAUSE_DRINK, 0);
+        registerModel(ModItems.MODEM, 0);
         registerModel(ModItems.RAM, 0);
         registerModel(ModItems.RAM_ON_A_STICK, 0);
         registerModel(ModItems.SURSTROEMMING, 0);
-        registerModel(ModItems.AHOJ_BRAUSE, 0);
-        registerModel(ModItems.AHOJ_BRAUSE_DRINK, 0);
     }
 
     private static void registerModel(Item item, int meta)

src/main/resources/assets/spackenmobs/advancements/general/modem.json

@@ -0,0 +1,26 @@
+{
+  "display": {
+    "icon": {
+      "item": "spackenmobs:modem"
+    },
+    "title": {
+      "translate": "advancements.general.modem.title"
+    },
+    "description": {
+      "translate": "advancements.general.modem.description"
+    }
+  },
+  "parent": "spackenmobs:general/root",
+  "criteria": {
+    "ram": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "spackenmobs:modem"
+          }
+        ]
+      }
+    }
+  }
+}

src/main/resources/assets/spackenmobs/lang/de_de.lang

@@ -2,6 +2,8 @@ advancements.general.ahoj_brause.description=Töte oder handle mit einem Friedri
 advancements.general.ahoj_brause.title=Das pulvert mich richtig 'n bisschen auf
 advancements.general.ahoj_brause_drink.description=Melke einen Friedrich Liechtenstein und erhalte eine Ahoj-Brause Brause
 advancements.general.ahoj_brause_drink.title=Diese Brause ist enorm
+advancements.general.modem.description=Töte einen Marcell D'Avis und erhalte ein Modem
+advancements.general.modem.title=VOLLER EMPFANG!
 advancements.general.ram.description=Töte einen Jens und erhalte Corsair RAM
 advancements.general.ram.title=MemTest
 advancements.general.ram_on_a_stick.description=Stelle eine RAM-Rute her, um einen Jens zu reiten
@@ -27,6 +29,7 @@ entity.smava_creeper.name=Smava-Creeper
 entity.tilera_ghast.name=tilera-Ghast
 item.ahoj_brause.name=Ahoj-Brause Brausepulver
 item.ahoj_brause_drink.name=Ahoj-Brause Brause
+item.modem.name=Modem
 item.ram.name=RAM
 item.ram_on_a_stick.name=RAM-Rute
 item.surstroemming.name=Surströmming

src/main/resources/assets/spackenmobs/lang/en_us.lang

@@ -2,6 +2,8 @@ advancements.general.ahoj_brause.description=Kill or trade with a Friedrich Liec
 advancements.general.ahoj_brause.title=Das pulvert mich richtig 'n bisschen auf
 advancements.general.ahoj_brause_drink.description=Milk a Friedrich Liechtenstein and get an Ahoj-Brause Soda
 advancements.general.ahoj_brause_drink.title=Diese Brause ist enorm
+advancements.general.modem.description=Kill a Marcell D'Avis and get a modem
+advancements.general.modem.title=VOLLER EMPFANG!
 advancements.general.ram.description=Kill a Jens and get Corsair RAM
 advancements.general.ram.title=MemTest
 advancements.general.ram_on_a_stick.description=Craft a RAM On A Stick to ride Jens
@@ -27,6 +29,7 @@ entity.smava_creeper.name=Smava Creeper
 entity.tilera_ghast.name=tilera Ghast
 item.ahoj_brause.name=Ahoj-Brause Soda Powder
 item.ahoj_brause_drink.name=Ahoj-Brause Soda
+item.modem.name=Modem
 item.ram.name=RAM
 item.ram_on_a_stick.name=RAM on a Stick
 item.surstroemming.name=Surströmming

src/main/resources/assets/spackenmobs/loot_tables/entities/holzstammhuhn.json

@@ -0,0 +1,67 @@
+{
+  "pools": [
+    {
+      "name": "holzstammhuhn",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "name": "minecraft:stick",
+          "weight": 1,
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 2
+              }
+            },
+            {
+              "function": "looting_enchant",
+              "count": {
+                "min": 0,
+                "max": 1
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "holzstammhuhn",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "name": "minecraft:log",
+          "weight": 1,
+          "functions": [
+            {
+              "function": "set_data",
+              "data": 0
+            },
+            {
+              "function": "furnace_smelt",
+              "conditions": [
+                {
+                  "condition": "entity_properties",
+                  "entity": "this",
+                  "properties": {
+                    "on_fire": true
+                  }
+                }
+              ]
+            },
+            {
+              "function": "looting_enchant",
+              "count": {
+                "min": 0,
+                "max": 1
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

src/main/resources/assets/spackenmobs/loot_tables/entities/marcell_davis.json

@@ -0,0 +1,31 @@
+{
+  "pools": [
+    {
+      "name": "marcell_davis",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "name": "spackenmobs:modem",
+          "weight": 1,
+          "functions": [
+            {
+              "function": "set_count",
+              "count": {
+                "min": 0,
+                "max": 1
+              }
+            },
+            {
+              "function": "looting_enchant",
+              "count": {
+                "min": 0,
+                "max": 1
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

src/main/resources/assets/spackenmobs/models/item/modem.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "spackenmobs:items/modem"
+  }
+}

src/main/resources/assets/spackenmobs/sounds.json

@@ -1077,5 +1077,22 @@
         "name": "spackenmobs:mztewolf/say8"
       }
     ]
+  },
+  "entities.mztewolf.death": {
+    "sounds": [
+      {
+        "name": "spackenmobs:mztewolf/death1"
+      }
+    ]
+  },
+  "entities.mztewolf.hurt": {
+    "sounds": [
+      {
+        "name": "spackenmobs:mztewolf/hurt1"
+      },
+      {
+        "name": "spackenmobs:mztewolf/hurt2"
+      }
+    ]
   }
 }

src/main/resources/mcmod.info

@@ -3,8 +3,8 @@
     "modid": "spackenmobs",
     "name": "Spackenmobs",
     "description": "The most important mobs in the history of Minecraft! [citation needed]",
-    "version": "RC8",
-    "mcversion": "1.12.2",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
     "url": "https://github.com/ACGaming/Spackenmobs",
     "updateUrl": "",
     "authorList": [