Make plants plantable on purified swamp dirt

Pustekuchen98 · Jan 5, 2023 · 3911c98 · 3911c98
1 parent 60b5ed4
commit 3911c98
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 22 deletions.
diff --git a/src/main/java/thebetweenlands/common/item/IGenericItem.java b/src/main/java/thebetweenlands/common/item/IGenericItem.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
@@ -70,7 +72,7 @@ static class TypeContainer {
 	 * @param type
 	 * @return
 	 */
-	public static List<IGenericItem> getGenericItems(Class<? extends Enum<?>> type) {
+	public static <X extends Enum<?> & IGenericItem> List<IGenericItem> getGenericItems(Class<? extends X> type) {
 		List<IGenericItem> genericItems = TYPE_CONTAINER.typeToItems.get(type);
 		if(genericItems == null) {
 			if(!IGenericItem.class.isAssignableFrom(type))
@@ -88,7 +90,8 @@ public static List<IGenericItem> getGenericItems(Class<? extends Enum<?>> type)
 	 * @param id
 	 * @return
 	 */
-	public static IGenericItem getFromID(Class<? extends Enum<?>> type, int id) {
+	@Nullable
+	public static <X extends Enum<?> & IGenericItem> IGenericItem getFromID(Class<? extends X> type, int id) {
 		for(IGenericItem item : getGenericItems(type)) {
 			if(item.getID() == id)
 				return item;
@@ -102,7 +105,8 @@ public static IGenericItem getFromID(Class<? extends Enum<?>> type, int id) {
 	 * @param stack
 	 * @return
 	 */
-	public static IGenericItem getFromStack(Class<? extends Enum<?>> type, ItemStack stack) {
+	@Nullable
+	public static <X extends Enum<?> & IGenericItem> IGenericItem getFromStack(Class<? extends X> type, ItemStack stack) {
 		return stack.isEmpty() ? null : getFromID(type, stack.getItemDamage());
 	}
 }
diff --git a/src/main/java/thebetweenlands/common/item/herblore/ItemCrushed.java b/src/main/java/thebetweenlands/common/item/herblore/ItemCrushed.java
@@ -58,11 +58,11 @@ public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
 
 	@Override
 	public String getTranslationKey(ItemStack stack) {
-		try {
-			return "item.thebetweenlands." + IGenericItem.getFromStack(EnumItemCrushed.class, stack).getTranslationKey();
-		} catch (Exception e) {
-			return "item.thebetweenlands.unknown_crushed";
+		IGenericItem item = IGenericItem.getFromStack(EnumItemCrushed.class, stack);
+		if(item != null) {
+			return "item.thebetweenlands." + item.getTranslationKey();
 		}
+		return "item.thebetweenlands.unknown_crushed";
 	}
 
 	@Override

diff --git a/src/main/java/thebetweenlands/common/item/herblore/ItemPlantDrop.java b/src/main/java/thebetweenlands/common/item/herblore/ItemPlantDrop.java
@@ -29,11 +29,11 @@ public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
 
 	@Override
 	public String getTranslationKey(ItemStack stack) {
-		try {
-			return "item.thebetweenlands." + IGenericItem.getFromStack(EnumItemPlantDrop.class, stack).getTranslationKey();
-		} catch (Exception e) {
-			return "item.thebetweenlands.unknown_plant_drop";
+		IGenericItem item = IGenericItem.getFromStack(EnumItemPlantDrop.class, stack);
+		if(item != null) {
+			return "item.thebetweenlands." + item.getTranslationKey();
 		}
+		return "item.thebetweenlands.unknown_plant_drop";
 	}
 
 	@Override

diff --git a/src/main/java/thebetweenlands/common/item/misc/ItemMisc.java b/src/main/java/thebetweenlands/common/item/misc/ItemMisc.java
@@ -58,10 +58,14 @@ public ItemMisc() {
 	@SideOnly(Side.CLIENT)
 	@Override
 	public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
-		String key = "tooltip.bl.item_misc." + IGenericItem.getFromStack(EnumItemMisc.class, stack).getTranslationKey();
+		IGenericItem item = IGenericItem.getFromStack(EnumItemMisc.class, stack);
+
+		if(item != null) {
+			String key = "tooltip.bl.item_misc." + item.getTranslationKey();
 
-		if(I18n.hasKey(key)) {
-			tooltip.add(I18n.format(key));
+			if(I18n.hasKey(key)) {
+				tooltip.add(I18n.format(key));
+			}
 		}
 	}
 
@@ -74,11 +78,11 @@ public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
 
 	@Override
 	public String getTranslationKey(ItemStack stack) {
-		try {
-			return "item.thebetweenlands." + IGenericItem.getFromStack(EnumItemMisc.class, stack).getTranslationKey();
-		} catch (Exception e) {
-			return "item.thebetweenlands.unknown_generic";
+		IGenericItem item = IGenericItem.getFromStack(EnumItemMisc.class, stack);
+		if(item != null) {
+			return "item.thebetweenlands." + item.getTranslationKey();
 		}
+		return "item.thebetweenlands.unknown_generic";
 	}
 
 	@Override

diff --git a/src/main/java/thebetweenlands/common/item/misc/ItemSwampTalisman.java b/src/main/java/thebetweenlands/common/item/misc/ItemSwampTalisman.java
@@ -73,11 +73,11 @@ public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
 
 	@Override
 	public String getTranslationKey(ItemStack stack) {
-		try {
-			return "item.thebetweenlands." + IGenericItem.getFromStack(EnumTalisman.class, stack).getTranslationKey();
-		} catch (Exception e) {
-			return "item.thebetweenlands.unknown_talisman";
+		IGenericItem item = IGenericItem.getFromStack(EnumTalisman.class, stack);
+		if(item != null) {
+			return "item.thebetweenlands." + item.getTranslationKey();
 		}
+		return "item.thebetweenlands.unknown_talisman";
 	}
 
 	@SideOnly(Side.CLIENT)

diff --git a/src/main/java/thebetweenlands/common/world/gen/biome/decorator/SurfaceType.java b/src/main/java/thebetweenlands/common/world/gen/biome/decorator/SurfaceType.java
@@ -20,10 +20,13 @@ public enum SurfaceType implements Predicate<IBlockState> {
 			BlockMatcher.forBlock(Blocks.GRASS),
 			BlockMatcher.forBlock(Blocks.MYCELIUM),
 			BlockMatcher.forBlock(BlockRegistry.SWAMP_GRASS),
+			BlockMatcher.forBlock(BlockRegistry.DUG_PURIFIED_SWAMP_GRASS),
 			BlockMatcher.forBlock(BlockRegistry.DEAD_GRASS)
 			)),
 	DIRT(ImmutableList.of(
 			BlockMatcher.forBlock(BlockRegistry.SWAMP_DIRT),
+			BlockMatcher.forBlock(BlockRegistry.PURIFIED_SWAMP_DIRT),
+			BlockMatcher.forBlock(BlockRegistry.DUG_SWAMP_DIRT),
 			BlockMatcher.forBlock(Blocks.DIRT),
 			BlockMatcher.forBlock(BlockRegistry.MUD),
 			BlockMatcher.forBlock(BlockRegistry.COMPACTED_MUD),