added new tab, fixed lang files

rawkit1 · Sep 12, 2018 · ccd8353 · ccd8353
1 parent 1c99161
commit ccd8353
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 34 deletions.
diff --git a/src/main/java/com/enwash/deco/Main.java b/src/main/java/com/enwash/deco/Main.java
@@ -2,6 +2,7 @@
 
 import com.enwash.deco.init.OreDictInit;
 import com.enwash.deco.proxy.CommonProxy;
+import com.enwash.deco.tabs.Busts;
 import com.enwash.deco.tabs.Furniture;
 import com.enwash.deco.tabs.Lighting;
 import com.enwash.deco.tabs.Resources;
@@ -25,7 +26,8 @@ public class Main {
 
 	public static final CreativeTabs lighting = new Lighting("lighting");
 	public static final CreativeTabs furniture = new Furniture("furniture");
-	public static final CreativeTabs resources = new Resources("btdcresources");
+	public static final CreativeTabs busts = new Busts("busts");
+	public static final CreativeTabs resources = new Resources("btdcmisc");
 
 	@SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.COMMON_PROXY_CLASS)
 	public static CommonProxy proxy;

diff --git a/src/main/java/com/enwash/deco/blocks/Bust.java b/src/main/java/com/enwash/deco/blocks/Bust.java
@@ -34,7 +34,7 @@ public Bust(String name, Material material)
 		super(material);
 		setUnlocalizedName(name);
 		setRegistryName(name);
-		setCreativeTab(Main.furniture);
+		setCreativeTab(Main.busts);
 		setSoundType(SoundType.STONE);
 		setHardness(3.0F);
 		setResistance(1.0F);

diff --git a/src/main/java/com/enwash/deco/blocks/CoffeeTable.java b/src/main/java/com/enwash/deco/blocks/CoffeeTable.java
@@ -1,24 +1,17 @@
 package com.enwash.deco.blocks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.enwash.deco.Main;
 import com.enwash.deco.init.ModBlocks;
 import com.enwash.deco.init.ModItems;
 import com.enwash.deco.util.IHasModel;
-import com.google.common.collect.Lists;
-
 
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
@@ -28,8 +21,6 @@
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
@@ -60,7 +51,8 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, Entity
     {
         if(placer instanceof EntityPlayer)
         {
-            EntityPlayer player = (EntityPlayer) placer;
+            @SuppressWarnings("unused")
+			EntityPlayer player = (EntityPlayer) placer;
         }
         super.onBlockPlacedBy(world, pos, state, placer, stack);
     }

diff --git a/src/main/java/com/enwash/deco/blocks/LogDeer.java b/src/main/java/com/enwash/deco/blocks/LogDeer.java
@@ -34,7 +34,7 @@ public LogDeer(String name, Material material)
 		super(material);
 		setUnlocalizedName(name);
 		setRegistryName(name);
-		setCreativeTab(Main.furniture);
+		setCreativeTab(Main.busts);
 		setSoundType(SoundType.WOOD);
 		setHardness(2.0F);
 		setResistance(1.0F);

diff --git a/src/main/java/com/enwash/deco/init/ModBlocks.java b/src/main/java/com/enwash/deco/init/ModBlocks.java
@@ -11,7 +11,6 @@
 import com.enwash.deco.blocks.LogDeer;
 import com.enwash.deco.blocks.LogTinted;
 import com.enwash.deco.blocks.Mailbox;
-import com.enwash.deco.blocks.CoffeeTable;
 import com.enwash.deco.blocks.TorchTall;
 
 import net.minecraft.block.Block;
@@ -38,7 +37,5 @@ public class ModBlocks {
 	public static final Block LUCKYCAT_WHITE = new Bust("luckycat_white", Material.ROCK);
 	public static final Block LUCKYCAT_BLACK = new Bust("luckycat_black", Material.ROCK);
 	public static final Block COFFEE_TABLE_GLASS = new CoffeeTable("coffee_table_glass", Material.WOOD, SoundType.WOOD);
-	//public static final Block FOUNTAIN = new Fountain("fountain", Material.ROCK);
 	public static final Block FOUNTAIN = new Fountain("fountain", Material.ROCK);
-	public static final Block COFFEE_TABLE = new CoffeeTable("coffee_table", Material.WOOD, SoundType.GLASS);
 }
diff --git a/src/main/java/com/enwash/deco/tabs/Busts.java b/src/main/java/com/enwash/deco/tabs/Busts.java
@@ -0,0 +1,14 @@
+package com.enwash.deco.tabs;
+
+import com.enwash.deco.init.ModBlocks;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.ItemStack;
+
+public class Busts extends CreativeTabs {
+
+	public Busts(String label) {super("busts");}
+	@Override
+	public ItemStack getTabIconItem() { return new ItemStack(ModBlocks.BUST_NOTCH); }
+
+}
diff --git a/src/main/java/com/enwash/deco/tabs/Furniture.java b/src/main/java/com/enwash/deco/tabs/Furniture.java
@@ -9,6 +9,6 @@ public class Furniture extends CreativeTabs {
 
 	public Furniture(String label) {super("furniture");}
 	@Override
-	public ItemStack getTabIconItem() { return new ItemStack(ModBlocks.BUST_NOTCH); }
+	public ItemStack getTabIconItem() { return new ItemStack(ModBlocks.MAILBOX_WOOD); }
 
 }
diff --git a/src/main/java/com/enwash/deco/tabs/Resources.java b/src/main/java/com/enwash/deco/tabs/Resources.java
@@ -7,8 +7,8 @@
 
 public class Resources extends CreativeTabs {
 
-	public Resources(String label) {super("bdresources");}
+	public Resources(String label) {super("btdcmisc");}
 	@Override
-	public ItemStack getTabIconItem() { return new ItemStack(ModBlocks.MAILBOX_WOOD); }
+	public ItemStack getTabIconItem() { return new ItemStack(ModBlocks.LOG_TINTED); }
 
 }
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,8 @@
 // ITEMS
 
 //item.ethereum_shard.name=Ethereum Shard
-<<<<<<< HEAD
-item.item_404.name=§k§c-§r§6item_§4404§r§k§c-§r
-=======
 item.item_404.name=§c-§r§6item_§4404§r§c-§r
 
->>>>>>> 3218dc03bac777b46f50fbe64bedb8af177f3a33
 // BLOCKS
 
 tile.fountain.name=Fountain
@@ -19,11 +15,7 @@ tile.logdeer.name=Log Deer
 tile.luckycat_white.name=Lucky Cat (White)
 tile.luckycat_black.name=Lucky Cat (Black)
 tile.log_tinted.name=Tinted Log
-<<<<<<< HEAD
 tile.coffee_table_glass.name=Glass Coffee Table
-=======
-tile.coffee_table.name=Glass Coffee Table
->>>>>>> 3218dc03bac777b46f50fbe64bedb8af177f3a33
 
 // BUSTS
 
@@ -37,5 +29,6 @@ tile.bust_ghast.name=Ghast Bust
 // OTHER
 
 itemGroup.lighting=Better Deco: Lighting
-itemGroup.busts=Better Deco: Furniture
+itemGroup.busts=Better Deco: Statues
+itemGroup.furniture=Better Deco: Furniture
 itemGroup.btdcmisc=Better Deco: Resources
diff --git a/src/main/resources/assets/btdc/lang/nl_nl.lang b/src/main/resources/assets/btdc/lang/nl_nl.lang
@@ -11,23 +11,24 @@ tile.torch_tall_wood.name=Tikifakkel
 tile.chandelier.name=Kroonluchter
 tile.candelabra.name=Kandelaar
 tile.mailbox_wood.name=Houten Postbus
-tile.logdeer.name=Stamhert
+tile.logdeer.name=Boomstamhert
 tile.luckycat_white.name=Gelukskat (Wit)
 tile.luckycat_black.name=Gelukskat (Zwart)
-tile.log_tinted.name=Getinte Stam
+tile.log_tinted.name=Getinte Boomstam
 tile.coffee_table.name=Glazen Salontafel
 
 // BUSTS
 
 tile.bust_notch.name=Buste van Notch
 tile.bust_enwash.name=Buste van Enwash
-tile.bust_creeper.name=Buste van een Creeper
-tile.bust_zombie.name=Buste van een Zombie
+tile.bust_creeper.name=Beeldje van een Creeper
+tile.bust_zombie.name=Beeldje van een Zombie
 tile.bust_villager.name=Buste van een Dorpeling
-tile.bust_ghast.name=Buste van een Ghast
+tile.bust_ghast.name=Beeldje van een Ghast
 
 // OTHER
 
 itemGroup.lighting=Better Deco: Belichting
 itemGroup.busts=Better Deco: Standbeelden
-itemGroup.btdcmisc=Better Deco: Overige
+itemGroup.furniture=Better Deco: Meubilair
+itemGroup.btdcmisc=Better Deco: Materialen
diff --git a/src/main/resources/assets/btdc/models/block/bust_ghast.json b/src/main/resources/assets/btdc/models/block/bust_ghast.json
@@ -1,5 +1,6 @@
 {
 	"credit": "Made by Merlijn (DutchM/merren2306)",
+	"parent": "block/block",
 	"textures": {
 		"0": "blocks/hardened_clay_stained_brown",
 		"1": "btdc:blocks/bust_ghast",

diff --git a/src/main/resources/assets/btdc/models/block/fountain_solid.json b/src/main/resources/assets/btdc/models/block/fountain_solid.json
@@ -1,5 +1,6 @@
 {
 	"credit": "Made by Merlijn (DutchM/merren2306)",
+	"parent": "block/block",
 	"textures": {
 		"0": "blocks/hardened_clay_stained_white",
 		"particle": "blocks/hardened_clay_stained_white"