prepare for build

fixed alot of minor issues, especially in the lang files, to prepare for building a new release.
rawkit1 · Sep 17, 2018 · d299557 · d299557
1 parent 7bf8e54
commit d299557
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -75,3 +75,12 @@ processResources {
         exclude 'mcmod.info'
     }
 }
+
+jar {
+        manifest {
+            attributes([
+                    'Maven-Artifact': "${project.group}:${archivesBaseName}:${project.version}",
+                    'Timestamp'     : System.currentTimeMillis()
+            ])
+        }
+    }
diff --git a/src/main/java/com/enwash/deco/Main.java b/src/main/java/com/enwash/deco/Main.java
@@ -10,7 +10,6 @@
 import com.enwash.deco.util.handlers.RegistryHandler;
 
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraftforge.client.model.obj.OBJLoader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.Mod.Instance;
@@ -19,7 +18,7 @@
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
-@Mod(modid = Reference.MOD_ID, name = Reference.NAME, version = Reference.VERSION)
+@Mod(modid = Reference.MOD_ID, name = Reference.NAME, version = Reference.VERSION, updateJSON = Reference.UPDATE_URL)
 public class Main {
 
 	@Instance

diff --git a/src/main/java/com/enwash/deco/blocks/CoffeeTable.java b/src/main/java/com/enwash/deco/blocks/CoffeeTable.java
@@ -1,8 +1,6 @@
 package com.enwash.deco.blocks;
 
 import com.enwash.deco.Main;
-import com.enwash.deco.init.BTDCBlocks;
-import com.enwash.deco.init.BTDCItems;
 import com.enwash.deco.util.ICanHazModel;
 
 import net.minecraft.block.SoundType;
@@ -24,7 +22,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-public class CoffeeTable extends BlockBase
+public class CoffeeTable extends BlockBase implements ICanHazModel
 {
     public static final PropertyBool BACK = PropertyBool.create("back");
     public static final PropertyBool FORWARD = PropertyBool.create("forward");

diff --git a/src/main/java/com/enwash/deco/init/BTDCBlocks.java b/src/main/java/com/enwash/deco/init/BTDCBlocks.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.enwash.deco.Main;
 import com.enwash.deco.blocks.Bust;
 import com.enwash.deco.blocks.Candelabra;
 import com.enwash.deco.blocks.Chandelier;
@@ -49,7 +50,7 @@ public class BTDCBlocks {
 	public static final Block PLUSH_ENDERMAN = new Plush("plush_enderman", Material.CLOTH, SoundType.CLOTH);
 
 	// OTHER
-	public static final Block GLOBE = new Bust("globe", Material.WOOD, SoundType.WOOD);
+	public static final Block GLOBE = new Bust("globe", Material.WOOD, SoundType.WOOD).setCreativeTab(Main.furniture);
 	public static final Block LUCKYCAT_WHITE = new Bust("luckycat_white", Material.ROCK, SoundType.CLOTH);
 	public static final Block LUCKYCAT_BLACK = new Bust("luckycat_black", Material.ROCK, SoundType.CLOTH);
 	public static final Block LUCKYCAT_GOLD = new Bust("luckycat_gold", Material.IRON, SoundType.CLOTH);

diff --git a/src/main/java/com/enwash/deco/items/CraftTool.java b/src/main/java/com/enwash/deco/items/CraftTool.java
@@ -2,9 +2,9 @@
 
 import com.enwash.deco.Main;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 
+
 public class CraftTool extends ItemBase{
 
 	public CraftTool(String name, int uses) {

diff --git a/src/main/java/com/enwash/deco/items/ItemBase.java b/src/main/java/com/enwash/deco/items/ItemBase.java
@@ -3,9 +3,6 @@
 import com.enwash.deco.Main;
 import com.enwash.deco.init.BTDCItems;
 import com.enwash.deco.util.ICanHazModel;
-
-import net.minecraft.creativetab.CreativeTabs;
-import com.enwash.deco.util.ICanHazModel;
 import net.minecraft.item.Item;
 
 public class ItemBase extends Item implements ICanHazModel {

diff --git a/src/main/java/com/enwash/deco/util/Reference.java b/src/main/java/com/enwash/deco/util/Reference.java
@@ -4,10 +4,11 @@ public class Reference {
 
 	public static final String MOD_ID = "btdc";
 	public static final String NAME = "Better Deco";
-	public static final String VERSION = "1.0";
+	public static final String VERSION = "1.2";
 	public static final String ACCEPTED_VERSIONS = "[1.12.2]";
 	public static final String CLIENT_PROXY_CLASS = "com.enwash.deco.proxy.ClientProxy";
 	public static final String COMMON_PROXY_CLASS = "com.enwash.deco.proxy.CommonProxy";
+	public static final String UPDATE_URL = "https://raw.githubusercontent.com/rawkit1/BetterDeco/master/update.json";
 
 	public static final int GUI_MAILBOX = 0;
 }
diff --git a/src/main/resources/assets/btdc/lang/en_us.lang b/src/main/resources/assets/btdc/lang/en_us.lang
@@ -1,12 +1,7 @@
-<<<<<<< HEAD
 // ITEMS
-item.sewing_needle.name=Sewing Needle
-=======
-// ITEMS
 
 item.item_404.name=§c-§r§6item_§4404§r§c-§r
 item.sewing_kit.name=Sewing Kit
->>>>>>> a641695c715abc379525afdada2d835db24dacf0
 
 // BLOCKS
 
@@ -35,12 +30,8 @@ tile.bust_villager.name=Villager Bust
 tile.bust_ghast.name=Ghast Statuette
 tile.bust_slime.name=Slime Statuette
 
-<<<<<<< HEAD
 //TROPHIES
-=======
-//TROHPIES
 
->>>>>>> a641695c715abc379525afdada2d835db24dacf0
 tile.wall_mount.name=Trophy Mount
 tile.trophy_cow.name=Cow Trophy
 tile.trophy_pig.name=Pig Trophy

diff --git a/src/main/resources/assets/btdc/lang/nl_nl.lang b/src/main/resources/assets/btdc/lang/nl_nl.lang
@@ -11,12 +11,14 @@ tile.chandelier.name=Kroonluchter
 tile.candelabra.name=Kandelaar
 tile.mailbox_wood.name=Houten Postbus
 tile.logdeer.name=Boomstamhert
+tile.logdeer_big.name=Groot Boomstamhert
 tile.luckycat_white.name=Gelukskat (Wit)
 tile.luckycat_black.name=Gelukskat (Zwart)
 tile.luckycat_gold.name=Gelukskat (Goud)
 tile.log_tinted.name=Getinte Boomstam
 tile.coffee_table_glass.name=Glazen Salontafel
 tile.carpentry_station.name=Werktafel
+tile.globe.name=Wereldbol
 
 // BUSTS
 
@@ -28,7 +30,7 @@ tile.bust_villager.name=Buste van een Dorpeling
 tile.bust_ghast.name=Beeldje van een Ghast
 tile.bust_slime.name=Beeldje van Slijmkubussen
 
-//TROHPIES
+//TROPHIES
 
 tile.wall_mount.name=Trofeebevestiging
 tile.trophy_cow.name=Koeientrofee
@@ -41,6 +43,7 @@ tile.plush_enwash.name=Enwash-knuffel
 tile.plush_enderman.name=Endermanknuffel
 tile.plush_steve.name=Steve-knuffel
 tile.plush_beeshroom.name=Beeshroom-knuffel
+tile.plush_herobrine.name=Herobrine-knuffel
 
 // OTHER
 

diff --git a/src/main/resources/assets/btdc/recipes/plush_steve.json b/src/main/resources/assets/btdc/recipes/plush_steve.json
@@ -5,9 +5,6 @@
             "item": "minecraft:wool",
             "data": 32767
         },
-        {
-            "item": "minecraft:cobblestone"
-        },
         {
             "item": "btdc:sewing_kit",
             "data": 32767

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,10 +3,10 @@
   "modid": "btdc",
   "name": "Better Deco",
   "description": "Adds some useful things! And some useless things. Actually, like, a lot of useless things.",
-  "version": "1.0",
+  "version": "1.2",
   "mcversion": "1.12.2",
   "url": "",
-  "updateUrl": "",
+  "updateUrl": "https://raw.githubusercontent.com/rawkit1/BetterDeco/master/update.json",
   "authorList": ["enwash", "beeshroom", "Merlijn (DutchM/merren2306)"],
   "credits": "n/a",
   "logoFile": "",