1.2.3

fix serverside/clientside problems localization
arlyon · Aug 5, 2017 · b7d2571 · b7d2571
1 parent c507d29
commit b7d2571
Show file tree

Hide file tree

Showing 92 changed files with 150 additions and 20 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+version 1.2.
+
+    - fix serverside and clientside
+    - add rarity setting
+
 version 1.2
 
     - added enchantment book to creative

diff --git a/build.gradle b/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 = "1.2.2"
+version = "1.2.3"
 group = "arlyon.felling" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "felling"
 

diff --git a/src/main/java/arlyon/felling/Configuration.java b/src/main/java/arlyon/felling/Configuration.java
@@ -2,6 +2,8 @@
 
 /**
  * Created by Alexander Lyon on 30.07.2017.
+ *
+ * Controls the configurable options in the mod config menu.
  */
 
 public class Configuration {
@@ -11,5 +13,6 @@ public class Configuration {
     public static boolean disableWhenStanding = false;
     public static int durabilityDamage = 2;
     public static int leafMultiplier = 100;
+    public static int enchantmentRarity = 100;
 
 }
diff --git a/src/main/java/arlyon/felling/Constants.java b/src/main/java/arlyon/felling/Constants.java
@@ -5,6 +5,6 @@
 public class Constants {
     public static final String MOD_NAME = "Felling";
     public static final String MODID = "felling";
-    public static final String VERSION = "1.2.2";
+    public static final String VERSION = "1.2.3";
     public static final Enchantment felling = new Enchantment(net.minecraft.enchantment.Enchantment.Rarity.UNCOMMON, EntityEquipmentSlot.MAINHAND);
 }
diff --git a/src/main/java/arlyon/felling/Enchantment.java b/src/main/java/arlyon/felling/Enchantment.java
@@ -8,37 +8,49 @@
 
 import java.util.Arrays;
 
+/**
+ * The enchantment class for the Felling enchantment.
+ */
 public class Enchantment extends net.minecraft.enchantment.Enchantment {
 
-    // creates a new enchantment type called axe that can be applied on any tool with the class axe.
-    private static EnumEnchantmentType AXE = EnumHelper.addEnchantmentType("AXE", item -> item.getToolClasses(new ItemStack(item)).stream().anyMatch(toolClass -> toolClass.equals("axe")));
+    /**
+     * Axe enchantment type.
+     */
+    public static EnumEnchantmentType AXE = EnumHelper.addEnchantmentType("AXE", item -> {
+        assert item != null;
+        return item.getToolClasses(new ItemStack(item)).stream().anyMatch(toolClass -> toolClass.equals("axe"));
+    });
 
-    public Enchantment(Rarity rarityIn, EntityEquipmentSlot... slots) {
+    /**
+     * Sets name and registry name and assigns the proper predicate.
+     *
+     * @param rarityIn the rarity of the enchantment
+     * @param slots the slots in which the enchantment is valid
+     */
+    Enchantment(Rarity rarityIn, EntityEquipmentSlot... slots) {
         super(rarityIn, AXE, slots);
         setName("felling");
         setRegistryName("felling");
-
-        // add it to the creative tab
-        EnumEnchantmentType[] enchantmentTypes = CreativeTabs.TOOLS.getRelevantEnchantmentTypes();
-        enchantmentTypes = Arrays.copyOf(enchantmentTypes, enchantmentTypes.length+1);
-        enchantmentTypes[enchantmentTypes.length-1] = AXE;
-
-        CreativeTabs.TOOLS.setRelevantEnchantmentTypes(enchantmentTypes);
     }
 
     /**
-     * Returns the minimal value of enchantability needed on the enchantment level passed.
-     *
      * Felling I - 20
      * Felling II - 35
+     *
+     * @param enchantmentLevel The level you want to get minimum enchantability weight for.
+     * @return Minimus value of enchantability for the given enchantment level.
      */
-    public int getMinEnchantability(int enchantmentLevel) { return 5 + (enchantmentLevel) * 15; }
+    public int getMinEnchantability(int enchantmentLevel) { return ((5 + (enchantmentLevel) * 15) * Configuration.enchantmentRarity) / 100; }
 
     /**
-     * Returns the maximum value of enchantability needed on the enchantment level passed.
+     * Felling I - 35
+     * Felling II - 50
+     *
+     * @param enchantmentLevel The level you want to get maximun enchantability weight for.
+     * @return Maximum value of enchantability for the given enchantment level.
      */
     public int getMaxEnchantability(int enchantmentLevel) {
-        return this.getMinEnchantability(enchantmentLevel) + 50;
+        return this.getMinEnchantability(enchantmentLevel) + 15;
     }
 
     /**

diff --git a/src/main/java/arlyon/felling/EventHandler.java b/src/main/java/arlyon/felling/EventHandler.java
@@ -18,13 +18,19 @@
 import java.util.Random;
 
 /**
- * Handles the destroying of trees with the felling enchantment.
+ * The event handler container for both the FellingEvent and the RegistryEvent
  */
-
 public class EventHandler {
+
+    /**
+     * The felling event subscriber class, which contains all the required functions for the subscriber.
+     */
     @Mod.EventBusSubscriber(modid = Constants.MODID)
     public static class FellingEventHandler {
 
+        /**
+         * Used to determine which part of the tree a block is.
+         */
         private enum TreePart {
             LEAF,
             LOG,
@@ -80,6 +86,11 @@ private static TreePart getTreePart(Block block) {
          */
         @SubscribeEvent
         public static void fellTreeSubscriber(BlockEvent.BreakEvent event) {
+
+            if (event.getWorld().isRemote) {
+                return;
+            }
+
             EntityPlayer thePlayer = event.getPlayer();
             ItemStack mainHandItem = thePlayer.getHeldItemMainhand();
             int enchantmentLevel = EnchantmentHelper.getEnchantmentLevel(Constants.felling, mainHandItem);

diff --git a/src/main/java/arlyon/felling/proxy/ProxyClient.java b/src/main/java/arlyon/felling/proxy/ProxyClient.java
@@ -1,14 +1,27 @@
 package arlyon.felling.proxy;
 
+import arlyon.felling.Enchantment;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.enchantment.EnumEnchantmentType;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
+import java.util.Arrays;
+
 public class ProxyClient extends ProxyCommon {
 
     @Override
     public void preInit(FMLPreInitializationEvent e) {
+
         super.preInit(e);
+
+        // add it to the creative tab
+        EnumEnchantmentType[] enchantmentTypes = CreativeTabs.TOOLS.getRelevantEnchantmentTypes();
+        enchantmentTypes = Arrays.copyOf(enchantmentTypes, enchantmentTypes.length+1);
+        enchantmentTypes[enchantmentTypes.length-1] = Enchantment.AXE;
+        CreativeTabs.TOOLS.setRelevantEnchantmentTypes(enchantmentTypes);
+
     }
 
     @Override

diff --git a/src/main/resources/assets/felling/lang/af_ZA.lang b/src/main/resources/assets/felling/lang/af_ZA.lang
@@ -0,0 +1 @@
+enchantment.felling=Afkap
diff --git a/src/main/resources/assets/felling/lang/ar_SA.lang b/src/main/resources/assets/felling/lang/ar_SA.lang
@@ -0,0 +1 @@
+enchantment.felling=قطع
diff --git a/src/main/resources/assets/felling/lang/az_AZ.lang b/src/main/resources/assets/felling/lang/az_AZ.lang
@@ -0,0 +1 @@
+enchantment.felling=Kəsmə
diff --git a/src/main/resources/assets/felling/lang/be_BY.lang b/src/main/resources/assets/felling/lang/be_BY.lang
@@ -0,0 +1 @@
+enchantment.felling=рубка
diff --git a/src/main/resources/assets/felling/lang/bg_BG.lang b/src/main/resources/assets/felling/lang/bg_BG.lang
@@ -0,0 +1 @@
+enchantment.felling=сечене
diff --git a/src/main/resources/assets/felling/lang/br_FR.lang b/src/main/resources/assets/felling/lang/br_FR.lang
@@ -0,0 +1 @@
+enchantment.felling=Abattage
diff --git a/src/main/resources/assets/felling/lang/ca-val_ES.lang b/src/main/resources/assets/felling/lang/ca-val_ES.lang
@@ -0,0 +1 @@
+enchantment.felling=Tala
diff --git a/src/main/resources/assets/felling/lang/ca_ES.lang b/src/main/resources/assets/felling/lang/ca_ES.lang
@@ -0,0 +1 @@
+enchantment.felling=Talla
diff --git a/src/main/resources/assets/felling/lang/cs_CZ.lang b/src/main/resources/assets/felling/lang/cs_CZ.lang
@@ -0,0 +1 @@
+enchantment.felling=Kácení
diff --git a/src/main/resources/assets/felling/lang/cy_GB.lang b/src/main/resources/assets/felling/lang/cy_GB.lang
@@ -0,0 +1 @@
+enchantment.felling=Torrwch
diff --git a/src/main/resources/assets/felling/lang/de_AT.lang b/src/main/resources/assets/felling/lang/de_AT.lang
@@ -0,0 +1 @@
+enchantment.felling=Fällen
diff --git a/src/main/resources/assets/felling/lang/el_GR.lang b/src/main/resources/assets/felling/lang/el_GR.lang
@@ -0,0 +1 @@
+enchantment.felling=Περικόψει
diff --git a/src/main/resources/assets/felling/lang/en_7S.lang b/src/main/resources/assets/felling/lang/en_7S.lang
@@ -0,0 +1 @@
+enchantment.felling=Shiver m'Timber
diff --git a/src/main/resources/assets/felling/lang/en_AU.lang b/src/main/resources/assets/felling/lang/en_AU.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/en_CA.lang b/src/main/resources/assets/felling/lang/en_CA.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/en_GB.lang b/src/main/resources/assets/felling/lang/en_GB.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/en_NZ.lang b/src/main/resources/assets/felling/lang/en_NZ.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/eo_UY.lang b/src/main/resources/assets/felling/lang/eo_UY.lang
@@ -0,0 +1 @@
+enchantment.felling=Tala
diff --git a/src/main/resources/assets/felling/lang/es_AR.lang b/src/main/resources/assets/felling/lang/es_AR.lang
@@ -0,0 +1 @@
+enchantment.felling=Talar
diff --git a/src/main/resources/assets/felling/lang/es_MX.lang b/src/main/resources/assets/felling/lang/es_MX.lang
@@ -0,0 +1 @@
+enchantment.felling=Talar
diff --git a/src/main/resources/assets/felling/lang/es_UY.lang b/src/main/resources/assets/felling/lang/es_UY.lang
@@ -0,0 +1 @@
+enchantment.felling=Talar
diff --git a/src/main/resources/assets/felling/lang/es_VE.lang b/src/main/resources/assets/felling/lang/es_VE.lang
@@ -0,0 +1,3 @@
+//Translation by: Dorzar / VeryHardChamp
+//Act. 30/07/2017
+enchantment.felling=Talado Rápido
diff --git a/src/main/resources/assets/felling/lang/et_EE.lang b/src/main/resources/assets/felling/lang/et_EE.lang
@@ -0,0 +1 @@
+enchantment.felling=Langetamine
diff --git a/src/main/resources/assets/felling/lang/eu_ES.lang b/src/main/resources/assets/felling/lang/eu_ES.lang
@@ -0,0 +1 @@
+enchantment.felling=Mozketa
diff --git a/src/main/resources/assets/felling/lang/fa_IR.lang b/src/main/resources/assets/felling/lang/fa_IR.lang
@@ -0,0 +1 @@
+enchantment.felling=بریدن
diff --git a/src/main/resources/assets/felling/lang/fi_FI.lang b/src/main/resources/assets/felling/lang/fi_FI.lang
@@ -0,0 +1 @@
+enchantment.felling=Hakku
diff --git a/src/main/resources/assets/felling/lang/fil_PH.lang b/src/main/resources/assets/felling/lang/fil_PH.lang
@@ -0,0 +1 @@
+enchantment.felling=Putulin
diff --git a/src/main/resources/assets/felling/lang/fo_FO.lang b/src/main/resources/assets/felling/lang/fo_FO.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/fr_CA.lang b/src/main/resources/assets/felling/lang/fr_CA.lang
@@ -0,0 +1 @@
+enchantment.felling=Abattage
diff --git a/src/main/resources/assets/felling/lang/fr_FR.lang b/src/main/resources/assets/felling/lang/fr_FR.lang
@@ -0,0 +1 @@
+enchantment.felling=Abattage
diff --git a/src/main/resources/assets/felling/lang/fy_NL.lang b/src/main/resources/assets/felling/lang/fy_NL.lang
@@ -0,0 +1 @@
+enchantment.felling=Kappenfr_FR.lang
diff --git a/src/main/resources/assets/felling/lang/ga_IE.lang b/src/main/resources/assets/felling/lang/ga_IE.lang
@@ -0,0 +1 @@
+enchantment.felling=Tala
diff --git a/src/main/resources/assets/felling/lang/gd_GB.lang b/src/main/resources/assets/felling/lang/gd_GB.lang
@@ -0,0 +1 @@
+enchantment.felling=Tala
diff --git a/src/main/resources/assets/felling/lang/gl_ES.lang b/src/main/resources/assets/felling/lang/gl_ES.lang
@@ -0,0 +1 @@
+enchantment.felling=Tala
diff --git a/src/main/resources/assets/felling/lang/gv_IM.lang b/src/main/resources/assets/felling/lang/gv_IM.lang
@@ -0,0 +1 @@
+gd_GB.langenchantment.felling=Tala
diff --git a/src/main/resources/assets/felling/lang/haw.lang b/src/main/resources/assets/felling/lang/haw.lang
@@ -0,0 +1 @@
+enchantment.felling=Ana
diff --git a/src/main/resources/assets/felling/lang/he_IL.lang b/src/main/resources/assets/felling/lang/he_IL.lang
@@ -0,0 +1 @@
+enchantment.felling=גְדִיעָה
diff --git a/src/main/resources/assets/felling/lang/hi_IN.lang b/src/main/resources/assets/felling/lang/hi_IN.lang
@@ -0,0 +1 @@
+enchantment.felling=कटाई
diff --git a/src/main/resources/assets/felling/lang/hr_HR.lang b/src/main/resources/assets/felling/lang/hr_HR.lang
@@ -0,0 +1 @@
+enchantment.felling=Kivágás
diff --git a/src/main/resources/assets/felling/lang/hy_AM.lang b/src/main/resources/assets/felling/lang/hy_AM.lang
@@ -0,0 +1 @@
+enchantment.felling=կրճատել
diff --git a/src/main/resources/assets/felling/lang/id_ID.lang b/src/main/resources/assets/felling/lang/id_ID.lang
@@ -0,0 +1 @@
+enchantment.felling=Menebang
diff --git a/src/main/resources/assets/felling/lang/io.lang b/src/main/resources/assets/felling/lang/io.lang
@@ -0,0 +1 @@
+enchantment.felling=Sneiða
diff --git a/src/main/resources/assets/felling/lang/is_IS.lang b/src/main/resources/assets/felling/lang/is_IS.lang
@@ -0,0 +1 @@
+enchantment.felling=Sneiða
diff --git a/src/main/resources/assets/felling/lang/it_IT.lang b/src/main/resources/assets/felling/lang/it_IT.lang
@@ -0,0 +1 @@
+enchantment.felling=Abbattere
diff --git a/src/main/resources/assets/felling/lang/ja_JP.lang b/src/main/resources/assets/felling/lang/ja_JP.lang
@@ -0,0 +1 @@
+enchantment.felling=伐採
diff --git a/src/main/resources/assets/felling/lang/jbo_EN.lang b/src/main/resources/assets/felling/lang/jbo_EN.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/ka_GE.lang b/src/main/resources/assets/felling/lang/ka_GE.lang
@@ -0,0 +1 @@
+enchantment.felling=დაჭრილი
diff --git a/src/main/resources/assets/felling/lang/ko_KR.lang b/src/main/resources/assets/felling/lang/ko_KR.lang
@@ -0,0 +1 @@
+enchantment.felling=벌목
diff --git a/src/main/resources/assets/felling/lang/ksh_DE.lang b/src/main/resources/assets/felling/lang/ksh_DE.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/kw_GB.lang b/src/main/resources/assets/felling/lang/kw_GB.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/la_VA.lang b/src/main/resources/assets/felling/lang/la_VA.lang
@@ -0,0 +1 @@
+enchantment.felling=Caesa
diff --git a/src/main/resources/assets/felling/lang/lb_LU.lang b/src/main/resources/assets/felling/lang/lb_LU.lang
@@ -0,0 +1 @@
+enchantment.felling=Opzedeelen
diff --git a/src/main/resources/assets/felling/lang/li_LI.lang b/src/main/resources/assets/felling/lang/li_LI.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/lt_LT.lang b/src/main/resources/assets/felling/lang/lt_LT.lang
@@ -0,0 +1 @@
+enchantment.felling=Kirtavimas
diff --git a/src/main/resources/assets/felling/lang/lv_LV.lang b/src/main/resources/assets/felling/lang/lv_LV.lang
@@ -0,0 +1 @@
+enchantment.felling=Ciršana
diff --git a/src/main/resources/assets/felling/lang/mi_NZ.lang b/src/main/resources/assets/felling/lang/mi_NZ.lang
@@ -0,0 +1 @@
+enchantment.felling=Whakairo
diff --git a/src/main/resources/assets/felling/lang/mk_MK.lang b/src/main/resources/assets/felling/lang/mk_MK.lang
@@ -0,0 +1 @@
+enchantment.felling=Сеча
diff --git a/src/main/resources/assets/felling/lang/mn_MN.lang b/src/main/resources/assets/felling/lang/mn_MN.lang
@@ -0,0 +1 @@
+enchantment.felling=Борлуулалт
diff --git a/src/main/resources/assets/felling/lang/ms_MY.lang b/src/main/resources/assets/felling/lang/ms_MY.lang
@@ -0,0 +1 @@
+enchantment.felling=Penebangan
diff --git a/src/main/resources/assets/felling/lang/mt_MT.lang b/src/main/resources/assets/felling/lang/mt_MT.lang
@@ -0,0 +1 @@
+enchantment.felling=Qtugħ
diff --git a/src/main/resources/assets/felling/lang/nds_DE.lang b/src/main/resources/assets/felling/lang/nds_DE.lang
@@ -0,0 +1 @@
+enchantment.felling=Fällen
diff --git a/src/main/resources/assets/felling/lang/nl_NL.lang b/src/main/resources/assets/felling/lang/nl_NL.lang
@@ -0,0 +1 @@
+enchantment.felling=Vellen
diff --git a/src/main/resources/assets/felling/lang/nn_NO.lang b/src/main/resources/assets/felling/lang/nn_NO.lang
@@ -0,0 +1 @@
+enchantment.felling=Hogst
diff --git a/src/main/resources/assets/felling/lang/oc_FR.lang b/src/main/resources/assets/felling/lang/oc_FR.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/pl_PL.lang b/src/main/resources/assets/felling/lang/pl_PL.lang
@@ -0,0 +1 @@
+enchantment.felling=wyrąb
diff --git a/src/main/resources/assets/felling/lang/pt_PT.lang b/src/main/resources/assets/felling/lang/pt_PT.lang
@@ -0,0 +1 @@
+enchantment.felling=Corte
diff --git a/src/main/resources/assets/felling/lang/qya_AA.lang b/src/main/resources/assets/felling/lang/qya_AA.lang
@@ -0,0 +1 @@
+enchantment.felling=Rist
diff --git a/src/main/resources/assets/felling/lang/ro_RO.lang b/src/main/resources/assets/felling/lang/ro_RO.lang
@@ -0,0 +1 @@
+enchantment.felling=tăiere
diff --git a/src/main/resources/assets/felling/lang/ru_RU.lang b/src/main/resources/assets/felling/lang/ru_RU.lang
@@ -0,0 +1 @@
+enchantment.felling=рубка
diff --git a/src/main/resources/assets/felling/lang/sk_SK.lang b/src/main/resources/assets/felling/lang/sk_SK.lang
@@ -0,0 +1 @@
+enchantment.felling=výrub
diff --git a/src/main/resources/assets/felling/lang/sl_SL.lang b/src/main/resources/assets/felling/lang/sl_SL.lang
@@ -0,0 +1 @@
+enchantment.felling=Sečnja
diff --git a/src/main/resources/assets/felling/lang/sme.lang b/src/main/resources/assets/felling/lang/sme.lang
@@ -0,0 +1 @@
+enchantment.felling=Felling
diff --git a/src/main/resources/assets/felling/lang/so_SO.lang b/src/main/resources/assets/felling/lang/so_SO.lang
@@ -0,0 +1 @@
+enchantment.felling=Goynta
diff --git a/src/main/resources/assets/felling/lang/sq_AL.lang b/src/main/resources/assets/felling/lang/sq_AL.lang
@@ -0,0 +1 @@
+enchantment.felling=prerje
diff --git a/src/main/resources/assets/felling/lang/sr_SP.lang b/src/main/resources/assets/felling/lang/sr_SP.lang
@@ -0,0 +1 @@
+enchantment.felling=Сечење
diff --git a/src/main/resources/assets/felling/lang/sv_SE.lang b/src/main/resources/assets/felling/lang/sv_SE.lang
@@ -0,0 +1 @@
+enchantment.felling=Fällning