Merge pull request #11 from PrinceOfAmber/develop

1.1.0 some previous builds Develop

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx3G
 forge_version=14.23.1.2594
 mc_version=1.12.2
-mod_version=1.0.1
+mod_version=1.0.3

scripts_zen_example/rituals.zs

@@ -0,0 +1,8 @@
+import mods.rootsclassic.Ritual;
+
+
+Ritual.setRitualIngredients("livingSwordCrafting", [<minecraft:dirt>,<minecraft:stone>]);
+Ritual.setRitualIncense("livingSwordCrafting", [<minecraft:grass>,<minecraft:sand>]);
+
+
+

scripts_zen_example/spells.zs

@@ -0,0 +1,5 @@
+import mods.rootsclassic.Spell;
+
+
+Spell.setSpellItems("rosebush",[<minecraft:dirt>,<minecraft:grass>]);
+

src/main/java/elucent/rootsclassic/Roots.java

@@ -1,10 +1,18 @@
 package elucent.rootsclassic;
 
+import org.apache.logging.log4j.Logger;
 import elucent.rootsclassic.capability.RootsCapabilityManager;
+import elucent.rootsclassic.config.ConfigManager;
 import elucent.rootsclassic.config.EventConfigChanged;
+import elucent.rootsclassic.event.EventComponentSpells;
+import elucent.rootsclassic.event.EventHarvestDrops;
+import elucent.rootsclassic.event.EventManaBar;
 import elucent.rootsclassic.proxy.CommonProxy;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -36,11 +44,15 @@ public ItemStack getTabIconItem() {
   public static CommonProxy proxy;
   @Instance(Const.MODID)
   public static Roots instance;
+  public static Logger logger;
 
   @EventHandler
   public void preInit(FMLPreInitializationEvent event) {
+    logger = event.getModLog();
     ConfigManager.load(event);
-    MinecraftForge.EVENT_BUS.register(new EventManager());
+    MinecraftForge.EVENT_BUS.register(new EventComponentSpells());
+    MinecraftForge.EVENT_BUS.register(new EventHarvestDrops());
+    MinecraftForge.EVENT_BUS.register(new EventManaBar());
     MinecraftForge.EVENT_BUS.register(new RootsCapabilityManager());
     MinecraftForge.EVENT_BUS.register(new EventConfigChanged());
     MinecraftForge.EVENT_BUS.register(RegistryManager.class);
@@ -56,4 +68,18 @@ public void init(FMLInitializationEvent event) {
   public void postInit(FMLPostInitializationEvent event) {
     proxy.postInit(event);
   }
+
+  public static void chatMessage(EntityPlayer player, String message) {
+    if (player.world.isRemote)
+      player.sendMessage(new TextComponentString(lang(message)));
+  }
+
+  public static void statusMessage(EntityPlayer player, String message) {
+    if (player.world.isRemote)
+      player.sendStatusMessage(new TextComponentString(lang(message)), true);
+  }
+
+  public static String lang(String message) {
+    return I18n.format(message);
+  }
 }

src/main/java/elucent/rootsclassic/Util.java

@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -17,11 +15,11 @@
 
 public class Util {
 
+  public static final String NBT_TRACK_TICKS = "RMOD_trackTicks";
   public static Random random = new Random();
-  public static ArrayList<IBlockState> oreList = new ArrayList<IBlockState>();
-  public static ArrayList<Block> naturalBlocks = new ArrayList<Block>();
   public static ArrayList<Item> berries = new ArrayList<Item>();
 
+
   public static double randomDouble(double min, double max) {
     double range = max - min;
     double scale = random.nextDouble() * range;
@@ -45,19 +43,19 @@ public static BlockPos getRayTrace(World world, EntityPlayer player, int reachDi
   }
 
   public static void addTickTracking(Entity entity) {
-    if (entity.getEntityData().hasKey("RMOD_trackTicks")) {
-      entity.getEntityData().setInteger("RMOD_trackTicks", entity.getEntityData().getInteger("RMOD_trackTicks") + 1);
+    if (entity.getEntityData().hasKey(NBT_TRACK_TICKS)) {
+      entity.getEntityData().setInteger(NBT_TRACK_TICKS, entity.getEntityData().getInteger(NBT_TRACK_TICKS) + 1);
     }
     else {
-      entity.getEntityData().setInteger("RMOD_trackTicks", 1);
+      entity.getEntityData().setInteger(NBT_TRACK_TICKS, 1);
     }
   }
 
   public static void decrementTickTracking(Entity entity) {
-    if (entity.getEntityData().hasKey("RMOD_trackTicks")) {
-      entity.getEntityData().setInteger("RMOD_trackTicks", entity.getEntityData().getInteger("RMOD_trackTicks") - 1);
-      if (entity.getEntityData().getInteger("RMOD_trackTicks") == 0) {
-        entity.removeTag("RMOD_trackTicks");
+    if (entity.getEntityData().hasKey(NBT_TRACK_TICKS)) {
+      entity.getEntityData().setInteger(NBT_TRACK_TICKS, entity.getEntityData().getInteger(NBT_TRACK_TICKS) - 1);
+      if (entity.getEntityData().getInteger(NBT_TRACK_TICKS) == 0) {
+        entity.removeTag(NBT_TRACK_TICKS);
       }
     }
   }
@@ -80,31 +78,6 @@ public static Entity getRayTraceEntity(World world, EntityPlayer player, int rea
     return null;
   }
 
-  public static void initOres() {
-    oreList.add(Blocks.IRON_ORE.getDefaultState());
-    oreList.add(Blocks.GOLD_ORE.getDefaultState());
-    oreList.add(Blocks.DIAMOND_ORE.getDefaultState());
-    oreList.add(Blocks.REDSTONE_ORE.getDefaultState());
-    oreList.add(Blocks.LAPIS_ORE.getDefaultState());
-    oreList.add(Blocks.COAL_ORE.getDefaultState());
-  }
-
-  public static void initNaturalBlocks() {
-    naturalBlocks.add(Blocks.TALLGRASS);
-    naturalBlocks.add(Blocks.GRASS);
-    naturalBlocks.add(Blocks.GRASS_PATH);
-    naturalBlocks.add(Blocks.LEAVES);
-    naturalBlocks.add(Blocks.LOG);
-    naturalBlocks.add(Blocks.LOG2);
-    naturalBlocks.add(Blocks.PLANKS);
-    naturalBlocks.add(Blocks.CACTUS);
-    naturalBlocks.add(Blocks.WATERLILY);
-    naturalBlocks.add(Blocks.WATER);
-    naturalBlocks.add(Blocks.FLOWING_WATER);
-    naturalBlocks.add(Blocks.RED_FLOWER);
-    naturalBlocks.add(Blocks.YELLOW_FLOWER);
-  }
-
   public static void initBerries() {
     berries.add(RegistryManager.nightshade);
     berries.add(RegistryManager.blackCurrant);
@@ -113,54 +86,6 @@ public static void initBerries() {
     berries.add(RegistryManager.elderBerry);
   }
 
-  public static boolean containsItem(List<ItemStack> list, Item item) {
-    for (int i = 0; i < list.size(); i++) {
-      if (list.get(i) != null) {
-        if (list.get(i).getItem() == item) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  public static boolean containsItem(List<ItemStack> list, Block item) {
-    for (int i = 0; i < list.size(); i++) {
-      if (list.get(i) != null) {
-        if (Block.getBlockFromItem(list.get(i).getItem()) == item) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  public static boolean containsItem(List<ItemStack> list, Item item, int meta) {
-    for (int i = 0; i < list.size(); i++) {
-      if (list.get(i) != null) {
-        if (list.get(i).getItem() == item && list.get(i).getMetadata() == meta) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  public static boolean containsItem(List<ItemStack> list, Block item, int meta) {
-    for (int i = 0; i < list.size(); i++) {
-      if (list.get(i) != null) {
-        if (Block.getBlockFromItem(list.get(i).getItem()) == item && list.get(i).getMetadata() == meta) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  public static IBlockState getRandomOre() {
-    return oreList.get(random.nextInt(oreList.size()));
-  }
-
   public static boolean oreDictMatches(ItemStack stack1, ItemStack stack2) {
     if (OreDictionary.itemMatches(stack1, stack2, true)) {
       return true;
@@ -180,15 +105,6 @@ public static int intColor(int r, int g, int b) {
     return (r * 65536 + g * 256 + b);
   }
 
-  public static boolean isNaturalBlock(Block block) {
-    for (int i = 0; i < naturalBlocks.size(); i++) {
-      if (naturalBlocks.get(i) == block) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   public static boolean itemListsMatchWithSize(List<ItemStack> i1, List<ItemStack> i2) {
     ArrayList<ItemStack> recipe = new ArrayList<ItemStack>();
     ArrayList<ItemStack> available = new ArrayList<ItemStack>();
@@ -250,4 +166,10 @@ public static boolean itemListsMatch(List<ItemStack> i1, List<ItemStack> i2) {
     }
     return recipe.size() == 0;
   }
+
+  public static void randomlyRepair(Random rnd, ItemStack stack) {
+    if (stack.isItemDamaged() && rnd.nextInt(80) == 0) {
+      stack.setItemDamage(stack.getItemDamage() - 1);
+    }
+  }
 }

src/main/java/elucent/rootsclassic/block/BlockAestheticStandingStone.java

@@ -10,20 +10,15 @@
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class BlockAestheticStandingStone extends TEBlockBase implements ITileEntityProvider {
 
@@ -82,11 +77,6 @@ public BlockAestheticStandingStone() {
     setHardness(1.0f);
   }
 
-  @SideOnly(Side.CLIENT)
-  public void initModel() {
-    ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(this), 0, new ModelResourceLocation(getRegistryName(), "inventory"));
-  }
-
   @Override
   public boolean canPlaceBlockAt(World world, BlockPos pos) {
     if (world.getBlockState(pos.up()) == Blocks.AIR.getDefaultState()) {