testing

.travis.yml

@@ -0,0 +1,24 @@
+sudo: required
+dist: trusty
+
+language: java
+jdk:
+  - oraclejdk8
+
+cach:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/
+
+before_install: chmod +x gradlew
+install:
+  - ./gradlew setupCIWorkspace -S
+script:
+  - ./gradlew build
+
+notification:
+  email:
+    recipients:
+      - vampirism@paube.de
+    on_success: never
+    on_failure: change

build.gradle

@@ -44,27 +44,18 @@ def loadProperties() {
 }
 
 apply from: 'gradle/forge.gradle'
-apply from: 'gradle/dev.gradle'
-apply from: 'gradle/deploy.gradle'
+apply from: 'gradle/versioning.gradle'
 
 sourceSets
         {
             main {
                 java {
-                    srcDir "$projectDir/src/main/java"
+                    srcDirs  = ["$projectDir/src/main/java","$projectDir/src/api/java"]
 				}
                 resources {
                     srcDir "$projectDir/src/main/resources"
                 }
             }
-            api {
-                java {
-                    srcDir "$projectDir/src/api/java"
-                }
-                resources {
-                    srcDir "$projectDir/src/api/resources"
-                }
-            }
             test {
                 java {
                     srcDir "$projectDir/src/test/java"

build.properties

@@ -3,6 +3,9 @@ minecraft_version=1.12.2
 forge_version=14.23.5.2768
 vampirism_version=1.12.2-1.4.9
 mappings=snapshot_20171003
+main_version=0
+major_version=1
+minor_version=1
 
 #Dependencies/Optional Libraries
 jei_version=1.12.2:4.9.2.196

gradle/deploy.gradle

@@ -7,7 +7,7 @@ curseforge {
         apiKey = "DUMMY"
     }
     project {
-        id = "233029"
+        id = ""
 
         if (config.type == "beta") {
             releaseType = 'beta'
@@ -21,12 +21,13 @@ curseforge {
         addGameVersion config.minecraft_version
 
         mainArtifact(jar) {
-            displayName = "Vampirism-${config.minecraft_version}-${project.mod_version}"
+            displayName = "Vampires & Werewolfes-${config.minecraft_version}-${project.mod_version}"
         }
 
         relations {
             optionalLibrary 'jei'
             optionalLibrary 'guide-api'
+			requiredLibrary 'vampirism'
         }
 
     }

gradle/forge.gradle

@@ -92,8 +92,8 @@ jar {
         }
     }
 
-    manifest {
-      attributes 'FMLAT':'vampirism_at.cfg'
-    }
+    //manifest {
+    //  attributes 'FMLAT':'vampirewerewolf_at.cfg'
+    //}
 
 }

src/main/java/de/teamlapen/vampirewerewolf/util/VReference.java → src/api/java/de/teamlapen/vampirewerewolf/api/VReference.java

@@ -1,4 +1,4 @@
-package de.teamlapen.vampirewerewolf.util;
+package de.teamlapen.vampirewerewolf.api;
 
 import de.teamlapen.vampirewerewolf.api.entities.player.werewolf.IWerewolfPlayer;
 import de.teamlapen.vampirism.api.entity.factions.IPlayableFaction;

src/api/java/de/teamlapen/vampirewerewolf/api/VampireWerewolfAPI.java

@@ -0,0 +1,5 @@
+package de.teamlapen.vampirewerewolf.api;
+
+public class VampireWerewolfAPI {
+
+}

src/api/java/de/teamlapen/vampirewerewolf/api/entities/player/werewolf/actions/DefaultWerewolfAction.java

@@ -1,7 +1,7 @@
 package de.teamlapen.vampirewerewolf.api.entities.player.werewolf.actions;
 
+import de.teamlapen.vampirewerewolf.api.VReference;
 import de.teamlapen.vampirewerewolf.api.entities.player.werewolf.IWerewolfPlayer;
-import de.teamlapen.vampirewerewolf.util.VReference;
 import de.teamlapen.vampirism.api.entity.player.actions.DefaultAction;
 import net.minecraft.util.ResourceLocation;
 

src/api/java/de/teamlapen/vampirewerewolf/api/items/ISilverFactionSlayerItem.java

@@ -0,0 +1,18 @@
+package de.teamlapen.vampirewerewolf.api.items;
+
+import de.teamlapen.vampirewerewolf.api.VReference;
+import de.teamlapen.vampirism.api.entity.factions.IFaction;
+import de.teamlapen.vampirism.api.items.IFactionSlayerItem;
+import net.minecraft.item.ItemStack;
+
+public interface ISilverFactionSlayerItem extends IFactionSlayerItem {
+
+    public default float getDamageMultiplierForFaction(ItemStack stack) {
+        return 1.5F;
+    }
+
+    @Override
+    public default IFaction getSlayedFaction() {
+        return VReference.WEREWOLF_FACTION;
+    }
+}

src/main/java/de/teamlapen/vampirewerewolf/VampireWerewolfMod.java

@@ -4,16 +4,17 @@
 import de.teamlapen.lib.lib.util.IInitListener;
 import de.teamlapen.lib.lib.util.IInitListener.Step;
 import de.teamlapen.lib.lib.util.Logger;
+import de.teamlapen.vampirewerewolf.api.VReference;
 import de.teamlapen.vampirewerewolf.api.entities.player.werewolf.IWerewolfPlayer;
 import de.teamlapen.vampirewerewolf.api.entities.werewolf.IWerewolfMob;
 import de.teamlapen.vampirewerewolf.config.Balance;
+import de.teamlapen.vampirewerewolf.config.RawMeatLoader;
 import de.teamlapen.vampirewerewolf.core.RegistryManager;
 import de.teamlapen.vampirewerewolf.player.ModPlayerEventHandler;
 import de.teamlapen.vampirewerewolf.player.werewolf.WerewolfPlayer;
 import de.teamlapen.vampirewerewolf.proxy.IProxy;
 import de.teamlapen.vampirewerewolf.util.REFERENCE;
 import de.teamlapen.vampirewerewolf.util.ScoreboardUtil;
-import de.teamlapen.vampirewerewolf.util.VReference;
 import de.teamlapen.vampirism.VampirismMod;
 import de.teamlapen.vampirism.api.VampirismAPI;
 import net.minecraft.block.material.Material;
@@ -73,6 +74,7 @@ public void preInit(FMLPreInitializationEvent event) {
         WerewolfPlayer.registerCapability();
         setupAPI2();
         Balance.init(new File(event.getModConfigurationDirectory(), REFERENCE.MODID), VampirismMod.inDev);
+        RawMeatLoader.init(new File(event.getModConfigurationDirectory(), REFERENCE.MODID));
 
         registryManager.onInitStep(Step.PRE_INIT, event);
         proxy.onInitStep(IInitListener.Step.PRE_INIT, event);

src/main/java/de/teamlapen/vampirewerewolf/blocks/BlockSilverOre.java

@@ -13,5 +13,4 @@ public BlockSilverOre() {
         this.setSoundType(SoundType.STONE);
         this.setHarvestLevel("pickaxe", 2);
     }
-
 }

src/main/java/de/teamlapen/vampirewerewolf/blocks/WerewolfFlower.java

@@ -0,0 +1,105 @@
+package de.teamlapen.vampirewerewolf.blocks;
+
+import de.teamlapen.lib.lib.item.ItemMetaBlock;
+import de.teamlapen.vampirewerewolf.VampireWerewolfMod;
+import de.teamlapen.vampirewerewolf.util.REFERENCE;
+import net.minecraft.block.BlockBush;
+import net.minecraft.block.properties.PropertyEnum;
+import net.minecraft.block.state.BlockStateContainer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.NonNullList;
+
+public class WerewolfFlower extends BlockBush implements ItemMetaBlock.IMetaItemName {
+    public final static PropertyEnum<EnumFlowerType> TYPE = PropertyEnum.create("type", EnumFlowerType.class);
+    private final static String regName = "werewolf_flower";
+
+    public WerewolfFlower() {
+        this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumFlowerType.WOLFBANE));
+        setCreativeTab(VampireWerewolfMod.creativeTab);
+        setRegistryName(REFERENCE.MODID, regName);
+        this.setUnlocalizedName(REFERENCE.MODID);
+    }
+
+    @Override
+    public int damageDropped(IBlockState state) {
+        return state.getValue(TYPE).getMeta();
+    }
+
+    @Override
+    public String getItemstackName(ItemStack stack) {
+        return EnumFlowerType.getType(stack.getItemDamage()).getUnlocalizedName();
+    }
+
+    @Override
+    public int getMetaFromState(IBlockState state) {
+        return state.getValue(TYPE).getMeta();
+    }
+
+    public String getRegisteredName() {
+        return regName;
+    }
+
+    @Override
+    public IBlockState getStateFromMeta(int meta) {
+        return this.getDefaultState().withProperty(TYPE, EnumFlowerType.getType(meta));
+    }
+
+    @Override
+    public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list) {
+        for (EnumFlowerType type : EnumFlowerType.values()) {
+            list.add(new ItemStack(this, 1, type.getMeta()));
+        }
+    }
+
+    @Override
+    protected BlockStateContainer createBlockState() {
+        return new BlockStateContainer(this, TYPE);
+    }
+
+    public enum EnumFlowerType implements IStringSerializable {
+
+        WOLFBANE(0, "werewolf_wolfsbane", "werewolf_wolfsbane");
+        private static final EnumFlowerType[] TYPE_FOR_META = new EnumFlowerType[values().length];
+
+        static {
+            for (final EnumFlowerType type : values()) {
+                TYPE_FOR_META[type.getMeta()] = type;
+            }
+        }
+
+        public static EnumFlowerType getType(int meta) {
+            if (meta >= TYPE_FOR_META.length) {
+                return TYPE_FOR_META[0];
+            }
+            return TYPE_FOR_META[meta];
+        }
+
+        private final int meta;
+        private final String name;
+        private final String unlocalizedName;
+
+        EnumFlowerType(int meta, String name, String unlocalizedName) {
+            this.meta = meta;
+            this.name = name;
+            this.unlocalizedName = unlocalizedName;
+        }
+
+        public int getMeta() {
+            return meta;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        public String getUnlocalizedName() {
+            return unlocalizedName;
+        }
+
+    }
+
+}

src/main/java/de/teamlapen/vampirewerewolf/client/core/ClientEventHandler.java

@@ -0,0 +1,10 @@
+package de.teamlapen.vampirewerewolf.client.core;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class ClientEventHandler {
+
+
+}

src/main/java/de/teamlapen/vampirewerewolf/client/core/ModBlocksRender.java

@@ -1,8 +1,10 @@
 package de.teamlapen.vampirewerewolf.client.core;
 
 import de.teamlapen.lib.lib.util.InventoryRenderHelper;
+import de.teamlapen.vampirewerewolf.blocks.WerewolfFlower;
 import de.teamlapen.vampirewerewolf.core.ModBlocks;
 import de.teamlapen.vampirewerewolf.util.REFERENCE;
+import net.minecraft.item.Item;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -16,5 +18,6 @@ public static void register() {
     private static void registerRenderer() {
         InventoryRenderHelper renderHelper = new InventoryRenderHelper(REFERENCE.MODID);
         renderHelper.registerRender(ModBlocks.silver_ore);
+        renderHelper.registerRenderAllMeta(Item.getItemFromBlock(ModBlocks.werewolf_flower), WerewolfFlower.EnumFlowerType.values());
     }
 }

src/main/java/de/teamlapen/vampirewerewolf/client/core/ModEntitiesRender.java

@@ -1,7 +1,7 @@
 package de.teamlapen.vampirewerewolf.client.core;
 
 import de.teamlapen.vampirewerewolf.client.render.RenderWerewolf;
-import de.teamlapen.vampirewerewolf.entities.EntityWerewolf;
+import de.teamlapen.vampirewerewolf.entity.EntityWerewolf;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/de/teamlapen/vampirewerewolf/client/core/ModItemsRender.java

@@ -2,7 +2,9 @@
 
 import de.teamlapen.lib.lib.util.InventoryRenderHelper;
 import de.teamlapen.vampirewerewolf.core.ModItems;
+import de.teamlapen.vampirewerewolf.items.ItemCrossbowArrow;
 import de.teamlapen.vampirewerewolf.util.REFERENCE;
+import net.minecraft.client.Minecraft;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -14,10 +16,23 @@ public static void register() {
 
     private static void registerRenderers() {
         InventoryRenderHelper renderHelper = new InventoryRenderHelper(REFERENCE.MODID);
-        renderHelper.registerRender(ModItems.item_silver_axe, "normal");
-        renderHelper.registerRender(ModItems.item_silver_pickaxe, "normal");
-        renderHelper.registerRender(ModItems.item_silver_sword, "normal");
-        renderHelper.registerRender(ModItems.item_silver_shovel, "normal");
-        renderHelper.registerRender(ModItems.item_silver_hoe, "normal");
+        renderHelper.registerRender(ModItems.silver_axe, "normal");
+        renderHelper.registerRender(ModItems.silver_pickaxe, "normal");
+        renderHelper.registerRender(ModItems.silver_sword, "normal");
+        renderHelper.registerRender(ModItems.silver_shovel, "normal");
+        renderHelper.registerRender(ModItems.silver_hoe, "normal");
+        renderHelper.registerRender(ModItems.silver_ingot, "normal");
+        renderHelper.registerRender(ModItems.crossbow_arrow, "silver");
+    }
+
+    static void registerColors() {
+        System.out.println("" + Minecraft.getMinecraft());
+        System.out.println("" + Minecraft.getMinecraft().getItemColors());
+        Minecraft.getMinecraft().getItemColors().registerItemColorHandler((stack, tintIndex) -> {
+            if (tintIndex == 1) {
+                return ItemCrossbowArrow.getType(stack).color;
+            }
+            return 0xFFFFFF;
+        }, ModItems.crossbow_arrow);
     }
 }

src/main/java/de/teamlapen/vampirewerewolf/client/core/RegistryManagerClient.java

@@ -17,8 +17,12 @@ public class RegistryManagerClient implements IInitListener {
     public void onInitStep(Step step, FMLStateEvent event) {
         switch (step) {
             case PRE_INIT:
+                break;
             case INIT:
+                ModItemsRender.registerColors();
+                break;
             case POST_INIT:
+                break;
         }
     }