Merge remote-tracking branch 'origin/HEAD' into 1.12

src/main/java/knightminer/ceramics/plugin/jei/JEIPlugin.java

@@ -38,16 +38,21 @@ public void register(IModRegistry registry) {
 				extensions.add(new ItemStack(Ceramics.clayBarrelStainedExtension, 1, color.getMetadata()));
 			}
 
-			// porcelain ones, we want all the colors in order
+			registry.addDescription(barrels, Util.prefix("jei.barrel.base"));
+			registry.addDescription(extensions, Util.prefix("jei.barrel.extension"));
+
+			// porcelain ones, have a larger capacity so a separate entry
 			if(Config.porcelainEnabled) {
+				ArrayList<ItemStack> porcelainBarrels = new ArrayList<ItemStack>();
+				ArrayList<ItemStack> porcelainExtensions = new ArrayList<ItemStack>();
 				for(EnumDyeColor color : EnumDyeColor.values()) {
-					barrels.add(new ItemStack(Ceramics.porcelainBarrel, 1, color.getMetadata()));
-					extensions.add(new ItemStack(Ceramics.porcelainBarrelExtension, 1, color.getMetadata()));
+					porcelainBarrels.add(new ItemStack(Ceramics.porcelainBarrel, 1, color.getMetadata()));
+					porcelainExtensions.add(new ItemStack(Ceramics.porcelainBarrelExtension, 1, color.getMetadata()));
 				}
-			}
 
-			registry.addDescription(barrels, Util.prefix("jei.barrel.base"));
-			registry.addDescription(extensions, Util.prefix("jei.barrel.extension"));
+				registry.addDescription(porcelainBarrels, Util.prefix("jei.barrel_porcelain.base"));
+				registry.addDescription(porcelainExtensions, Util.prefix("jei.barrel_porcelain.extension"));
+			}
 		}
 	}
 

src/main/resources/assets/ceramics/lang/en_US.lang

@@ -191,4 +191,6 @@ ceramics.barrel.fluid.amount=Contains: %smb %s
 # JEI Descriptions
 ceramics.jei.bucket=Clay buckets are an early game alternative to the standard iron bucket. Like their iron counterparts, they can be used to transport liquids, but will break after pouring out a hot liquid.
 ceramics.jei.barrel.base=Barrels are a simple fluid storage block, storing up to 4 buckets. If broken, the barrel will lose its fluid.
-ceramics.jei.barrel.extension=Barrel extensions can be placed above barrels to extend the capacity. An extension adds 4 buckets to the capacity, and can be additionally placed on an extension for nearly unlimited height.
+ceramics.jei.barrel.extension=Barrel extensions can be placed above barrels to extend the capacity. An extension adds 4 buckets to the capacity, and can be additionally placed on an extension for nearly unlimited height.
+ceramics.jei.barrel_porcelain.base=Porcelain barrels are an upgraded version of the clay barrel with a capacity of 6 buckets. Like its clay counterpart, it will lose its fluid when broken.
+ceramics.jei.barrel_porcelain.extension=Porcelain barrel extensions can be used to extend a porcelain barrel's capacity. The function the same as the clay extensions except they add 6 to the capacity, though clay and porcelain extension and barrels can not be mixed.