Merge remote-tracking branch 'origin/1.14' into 1.14.4

This commit is contained in:
modmuss50 2019-07-30 20:02:57 +01:00
commit 3c29c06d39
137 changed files with 2594 additions and 271 deletions

View file

@ -50,14 +50,8 @@ public class BlockOre extends Block {
public static int sodaliteMinQuatity = 1;
@ConfigRegistry(config = "misc", category = "blocks", key = "sodaliteMaxQuantity", comment = "Maximum quantity of Sodalite dust per Sodalite ore")
public static int sodaliteMaxQuantity = 2;
@ConfigRegistry(config = "misc", category = "blocks", key = "cinnabarMinQuatity", comment = "Minimum quantity of Cinnabar dust per Cinnabar ore")
public static int cinnabarMinQuatity = 1;
@ConfigRegistry(config = "misc", category = "blocks", key = "cinnabarMaxQuantity", comment = "Maximum quantity of Cinnabar dust per Cinnabar ore")
public static int cinnabarMaxQuantity = 2;
@ConfigRegistry(config = "misc", category = "blocks", key = "sphaleriteMinQuatity", comment = "Minimum quantity of Sphalerite dust per Sphalerite ore")
public static int sphaleriteMinQuatity = 1;
@ConfigRegistry(config = "misc", category = "blocks", key = "sphaleriteMaxQuantity", comment = "Maximum quantity of Sphalerite dust per Sphalerite ore")
public static int sphaleriteMaxQuantity = 2;
public BlockOre() {
super(FabricBlockSettings.of(Material.STONE).strength(2f, 2f).build());
@ -82,12 +76,8 @@ public class BlockOre extends Block {
// } else if (ore == TRContent.Ores.SODALITE.block) {
// OreDrop sodalite = new OreDrop(TRContent.Dusts.SODALITE.getStack(sodaliteMinQuatity), sodaliteMaxQuantity);
// drops.add(sodalite.getDrops(fortune, random));
// } else if (ore == TRContent.Ores.CINNABAR.block) {
// OreDrop cinnabar = new OreDrop(TRContent.Dusts.CINNABAR.getStack(cinnabarMinQuatity), cinnabarMaxQuantity);
// drops.add(cinnabar.getDrops(fortune, random));
// } else if (ore == TRContent.Ores.SPHALERITE.block) {
// OreDrop sphalerite = new OreDrop(TRContent.Dusts.SPHALERITE.getStack(sphaleriteMinQuatity), sphaleriteMaxQuantity);
// drops.add(sphalerite.getDrops(fortune, random));
// } else {
// drops.add(new ItemStack(this));
// }

View file

@ -41,8 +41,7 @@ public class BlockBreakHandler {
public static double aluminiumDropChance = 0.50;
@ConfigRegistry(config = "misc", category = "blocks", key = "redstoneDropChance", comment = "Chance to get Redstone from Cinnabar Ore")
public static double redstoneDropChance = 0.25;
@ConfigRegistry(config = "misc", category = "blocks", key = "yellowGarnetDropChance", comment = "Chance to get Yellow Garnet gem from Sphalerite Ore")
public static double yellowGarnetDropChance = 0.125;
//TODO 1.14
// @SubscribeEvent
@ -68,10 +67,7 @@ public class BlockBreakHandler {
// OreDrop redstone = new OreDrop(new ItemStack(Items.REDSTONE), redstoneDropChance, 1);
// drops.add(redstone.getDrops(event.getFortuneLevel(), random));
// }
// else if (state.getBlock().matches(new BlockTags.CachingTag(new Identifier(TechReborn.MOD_ID, "sphalerite_ore")))) {
// OreDrop yellowGarnet = new OreDrop(TRContent.Gems.YELLOW_GARNET.getStack(), yellowGarnetDropChance, 1);
// drops.add(yellowGarnet.getDrops(event.getFortuneLevel(), random));
// }
// }
// }
//