Bump forge again

This commit is contained in:
Vincent Lee committed 2017-06-24 22:28:18 -05:00
1 parent 835e09ed34
commit 101c72e633
51 files changed
+98 -83

No files matched your search

@@ -14,8 +14,8 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.common.registry.RegistryDelegate;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.registries.IRegistryDelegate;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewItem;
@@ -41,7 +41,7 @@ public final class ColorHandler {
public static void init() {
BlockColors blocks = Minecraft.getMinecraft().getBlockColors();
Map<RegistryDelegate<Block>, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap");
Map<IRegistryDelegate<Block>, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap");
// Steal vine colorer
blocks.registerBlockColorHandler(map.get(Blocks.VINE.delegate), ModBlocks.solidVines);
@@ -108,7 +108,7 @@ public final class ColorHandler {
ModItems.twigWand);
items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getColorValue(), ModItems.dye, ModItems.petal);
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t),
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t),
ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader);
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, (float) ((ItemManaMirror) ModItems.manaMirror).getMana(s) / (float) TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror);
@@ -21,8 +21,8 @@ import net.minecraft.item.Item;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.fml.common.registry.RegistryDelegate;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.registries.IRegistryDelegate;
import vazkii.botania.api.BotaniaAPIClient;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.client.model.SpecialFlowerModel;
@@ -170,7 +170,7 @@ public final class ModelHandler {
}
}
private static final Map<RegistryDelegate<Block>, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers");
private static final Map<IRegistryDelegate<Block>, IStateMapper> customStateMappers = ReflectionHelper.getPrivateValue(ModelLoader.class, null, "customStateMappers");
private static final DefaultStateMapper fallbackMapper = new DefaultStateMapper();
private static ModelResourceLocation getMrlForState(IBlockState state) {
@@ -437,7 +437,7 @@ public class GuiLexicon extends GuiScreen {
case -2 :
// todo 1.12 switch to botania tab
if(mc.player != null)
this.mc.displayGuiScreen(new GuiScreenAdvancements(this.mc.player.connection.func_191982_f()));
this.mc.displayGuiScreen(new GuiScreenAdvancements(this.mc.player.connection.getAdvancementManager()));
break;
case -3 :
mc.displayGuiScreen(new GuiLexiconChallengesList());
@@ -87,7 +87,7 @@ public class LayerGaiaHead implements LayerRenderer<EntityPlayer> {
// Botania - use gaia TESR
ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback);
((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TileGaiaHead.class))
((RenderTileGaiaHead) (TileEntitySpecialRenderer) TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class))
.renderSkull(-0.5F, 0.0F, -0.5F, EnumFacing.UP, 180.0F, itemstack.getMetadata(), null, -1, limbSwing);
ShaderHelper.releaseShader();
@@ -32,7 +32,7 @@ public class RenderPoolMinecart extends RenderMinecart<EntityPoolMinecart> {
protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull IBlockState state) {
RenderTilePool.forceVariant = PoolVariant.DEFAULT;
RenderTilePool.forceManaNumber = poolCart.getMana();
TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TilePool.class).renderTileEntityAt(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0);
TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0);
}
@@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal;
public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal> {
@Override
public void renderTileEntityAt(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nonnull TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress, float unused) {
if (!portal.getWorld().isBlockLoaded(portal.getPos(), false)
|| portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal)
return;
@@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.TileAltar;
public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
@Override
public void renderTileEntityAt(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
public void render(@Nonnull TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
if(!altar.getWorld().isBlockLoaded(altar.getPos(), false)
|| altar.getWorld().getBlockState(altar.getPos()).getBlock() != ModBlocks.altar)
return;
@@ -24,7 +24,7 @@ import vazkii.botania.common.block.tile.TileAnimatedTorch;
public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer<TileAnimatedTorch> {
@Override
public void renderTileEntityAt(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
public void render(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
Minecraft mc = Minecraft.getMinecraft();
GlStateManager.pushMatrix();
GlStateManager.translate(x, y, z);
@@ -41,7 +41,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
private static final ModelAvatar model = new ModelAvatar();
@Override
public void renderTileEntityAt(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
public void render(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
if (avatar != null)
if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false)
|| avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar)
@@ -31,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {
private static final ModelBellows model = new ModelBellows();
@Override
public void renderTileEntityAt(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress, float unused) {
if (bellows != null)
if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false)
|| bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows)
@@ -32,7 +32,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
public TileBrewery brewery;
@Override
public void renderTileEntityAt(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress, float unused) {
this.brewery = brewery;
GlStateManager.pushMatrix();
GlStateManager.enableRescaleNormal();
@@ -25,7 +25,7 @@ import vazkii.botania.common.block.tile.TileCocoon;
public class RenderTileCocoon extends TileEntitySpecialRenderer<TileCocoon> {
@Override
public void renderTileEntityAt(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nonnull TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress, float unused) {
float rot = 0F;
float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F;
if(cocoon.timePassed % modval < 10) {
@@ -50,7 +50,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
private RenderEntityItem itemRenderer = null;
@Override
public void renderTileEntityAt(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress, float unused) {
ItemStack stack = ItemStack.EMPTY;
if (cube != null) {
if(entity == null)
@@ -141,7 +141,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
private static BlockRendererDispatcher blockRenderer;
private void renderAnimatedModel(TileCorporeaCrystalCube te, double x, double y, double z, float partialTick) {
// From FastTESR.renderTileEntityAt
// From FastTESR.render
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder worldRenderer = tessellator.getBuffer();
bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
@@ -28,7 +28,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorpo
public static boolean move = true;
@Override
public void renderTileEntityAt(@Nullable TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress, float unused) {
public void render(@Nullable TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress, float unused) {
move = index != null;
GlStateManager.pushMatrix();
@@ -36,7 +36,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
private EntityItem item;
@Override
public void renderTileEntityAt(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nonnull TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress, float unused) {
float alphaMod = 0F;
if(enchanter.stage == TileEnchanter.State.GATHER_MANA)
@@ -29,7 +29,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
@Override
public void renderTileEntityAt(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress, float unused) {
public void render(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress, float unused) {
if(ConfigHandler.staticFloaters)
return;
@@ -33,7 +33,7 @@ import vazkii.botania.client.render.entity.RenderDoppleganger;
public class RenderTileGaiaHead extends TileEntitySkullRenderer {
@Override
public void renderTileEntityAt(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress, float unused) {
public void render(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress, float unused) {
ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback);
// Null-safe copy of super
@@ -32,7 +32,7 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass
final ModelHourglass model = new ModelHourglass();
@Override
public void renderTileEntityAt(@Nullable TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
public void render(@Nullable TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
GlStateManager.pushMatrix();
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -33,7 +33,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
@SuppressWarnings("deprecation")
@Override
public void renderTileEntityAt(@Nonnull TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
public void render(@Nonnull TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
if(!plate.getWorld().isBlockLoaded(plate.getPos(), false)
|| plate.getWorld().getBlockState(plate.getPos()).getBlock() != ModBlocks.incensePlate)
return;
@@ -38,7 +38,7 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRel
private static Map<LuminizerVariant, TextureAtlasSprite> sprites = new HashMap();
@Override
public void renderTileEntityAt(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress, float unused) {
public void render(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress, float unused) {
if(!tile.getWorld().isBlockLoaded(tile.getPos(), false) || tile.getWorld().getBlockState(tile.getPos()).getBlock() != ModBlocks.lightRelay)
return;
@@ -44,7 +44,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
public static int forceManaNumber = -1;
@Override
public void renderTileEntityAt(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) {
if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false)
|| pool.getWorld().getBlockState(pool.getPos()).getBlock() != ModBlocks.pool))
return;
@@ -27,7 +27,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism;
public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {
@Override
public void renderTileEntityAt(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress, float unused) {
public void render(@Nonnull TilePrism prism, double x, double y, double z, float partTicks, int digProgress, float unused) {
GlStateManager.pushMatrix();
GlStateManager.translate(x, y, z);
float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F;
@@ -46,7 +46,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> {
public static boolean pink = false;
@Override
public void renderTileEntityAt(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
public void render(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false)
|| pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon)
return;
@@ -28,7 +28,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
final ModelSpinningCubes cubes = new ModelSpinningCubes();
@Override
public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress, float unused) {
public void render(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress, float unused) {
GlStateManager.pushMatrix();
GlStateManager.color(1F, 1F, 1F, 1F);
GlStateManager.translate(x, y, z);
@@ -23,7 +23,7 @@ import vazkii.botania.common.block.tile.TileSparkChanger;
public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkChanger> {
@Override
public void renderTileEntityAt(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
public void render(@Nonnull TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress, float unused) {
GlStateManager.pushMatrix();
GlStateManager.translate(d0, d1, d2);
GlStateManager.rotate(90F, 1F, 0F, 0F);
@@ -46,7 +46,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
private static final ModelSpreader model = new ModelSpreader();
@Override
public void renderTileEntityAt(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
public void render(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress, float unused) {
if(!spreader.getWorld().isBlockLoaded(spreader.getPos(), false)
|| spreader.getWorld().getBlockState(spreader.getPos()).getBlock() != ModBlocks.spreader)
return;
@@ -39,7 +39,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16);
@Override
public void renderTileEntityAt(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage, float unused)
public void render(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage, float unused)
{
GlStateManager.disableLighting();
RANDOM.setSeed(31100L);
@@ -31,7 +31,7 @@ import vazkii.botania.common.block.tile.TileTerraPlate;
public class RenderTileTerraPlate extends TileEntitySpecialRenderer<TileTerraPlate> {
@Override
public void renderTileEntityAt(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nonnull TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress, float unused) {
float max = TileTerraPlate.MAX_MANA / 10F;
float alphaMod = Math.min(max, plate.getCurrentMana()) / max;
GlStateManager.pushMatrix();
@@ -33,7 +33,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer<TileTeruTe
final ModelTeruTeruBozu model = new ModelTeruTeruBozu();
@Override
public void renderTileEntityAt(@Nullable TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress, float unused) {
public void render(@Nullable TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress, float unused) {
GlStateManager.pushMatrix();
GlStateManager.enableRescaleNormal();
GlStateManager.enableBlend();
@@ -66,7 +66,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
}
@Override
public void renderTileEntityAt(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
public void render(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
if(!potato.getWorld().isBlockLoaded(potato.getPos(), false)
|| potato.getWorld().getBlockState(potato.getPos()).getBlock() != ModBlocks.tinyPotato)
return;
@@ -20,7 +20,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.item.IRelic;
import vazkii.botania.common.item.ModItems;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.common.item.ModItems;
@@ -19,7 +19,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.item.ItemBlackHoleTalisman;
import vazkii.botania.common.item.ModItems;
@@ -19,7 +19,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.mana.ICompositableLens;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.lens.ItemLens;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.item.ICosmeticAttachable;
import vazkii.botania.api.item.ICosmeticBauble;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.item.ICosmeticAttachable;
import vazkii.botania.api.item.ICosmeticBauble;
@@ -21,7 +21,7 @@ import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ModItems;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ItemKeepIvy;
import vazkii.botania.common.item.ModItems;
@@ -21,8 +21,8 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.common.item.lens.ItemLens;
import vazkii.botania.common.lib.LibOreDict;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.item.ItemManaGun;
import vazkii.botania.common.item.ModItems;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.api.mana.ILensControl;
import vazkii.botania.common.item.ItemManaGun;
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.item.ItemManaGun;
public class ManaGunRemoveLensRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe {
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.item.IPhantomInkable;
import vazkii.botania.common.item.ModItems;
@@ -19,7 +19,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
@@ -19,7 +19,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.item.ModItems;
public class SpellClothRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe {
@@ -18,7 +18,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
@@ -128,7 +128,7 @@ public final class ToolCommons {
return 0;
ItemTool tool = (ItemTool) item;
ToolMaterial material = tool.getToolMaterial();
ToolMaterial material = ToolMaterial.DIAMOND; // tool.getToolMaterial(); todo 1.12
int materialLevel = 0;
if(material == BotaniaAPI.manasteelToolMaterial)
materialLevel = 10;
@@ -97,8 +97,9 @@ public class ItemDice extends ItemRelic {
EntityPlayerMP mpPlayer = (EntityPlayerMP) player;
Item item = relicStacks[relic].getItem();
IRelic irelic = (IRelic) item;
Achievement achievement = irelic.getBindAchievement();
return mpPlayer.getStatFile().hasAchievementUnlocked(achievement);
return false; // todo 1.12
/*Achievement achievement = irelic.getBindAchievement();
return mpPlayer.getStatFile().hasAchievementUnlocked(achievement);*/
}
}
@@ -10,9 +10,11 @@
*/
package vazkii.botania.common.lexicon;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementProgress;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.stats.Achievement;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
@@ -20,21 +22,27 @@ import vazkii.botania.api.lexicon.LexiconCategory;
public class RelicLexiconEntry extends BasicLexiconEntry {
final Achievement a;
final ResourceLocation a;
public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, Achievement a) {
public RelicLexiconEntry(String unlocalizedName, LexiconCategory category, ResourceLocation advancement) {
super(unlocalizedName, category);
setKnowledgeType(BotaniaAPI.relicKnowledge);
this.a = a;
if(a != null)
setIcon(a.theItemStack.copy());
this.a = advancement;
/*if(a != null) todo 1.12
setIcon(a.theItemStack.copy());*/
}
@Override
@SideOnly(Side.CLIENT)
public boolean isVisible() {
EntityPlayerSP player = Minecraft.getMinecraft().player;
return a == null || player.capabilities.isCreativeMode || player.getStatFileWriter().hasAchievementUnlocked(a);
if(a == null || player.capabilities.isCreativeMode) {
return true;
} else {
Advancement a = player.connection.getAdvancementManager().getAdvancementList().getAdvancement(a);
AdvancementProgress progress = player.connection.getAdvancementManager().advancementToProgress.get(a);
return progress.isDone();
}
}
}
@@ -10,10 +10,12 @@
*/
package vazkii.botania.common.lexicon.page;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import net.minecraft.item.crafting.Ingredient;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
@@ -41,25 +43,29 @@ public class PageCraftingRecipe extends PageRecipe {
private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY);
final List<IRecipe> recipes;
final List<ResourceLocation> recipes;
int ticksElapsed = 0;
int recipeAt = 0;
boolean oreDictRecipe, shapelessRecipe;
public PageCraftingRecipe(String unlocalizedName, List<IRecipe> recipes) {
public PageCraftingRecipe(String unlocalizedName, List<ResourceLocation> recipes) {
super(unlocalizedName);
this.recipes = recipes;
}
public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) {
public PageCraftingRecipe(String unlocalizedName, ResourceLocation recipe) {
this(unlocalizedName, Collections.singletonList(recipe));
}
@Override
public void onPageAdded(LexiconEntry entry, int index) {
for(IRecipe recipe : recipes)
LexiconRecipeMappings.map(recipe.getRecipeOutput(), entry, index);
for(ResourceLocation name : recipes) {
IRecipe recipe = ForgeRegistries.RECIPES.getValue(name);
if(recipe != null && !recipe.getRecipeOutput().isEmpty()) {
LexiconRecipeMappings.map(recipe.getRecipeOutput(), entry, index);
}
}
}
@Override
@@ -67,7 +73,7 @@ public class PageCraftingRecipe extends PageRecipe {
public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {
oreDictRecipe = shapelessRecipe = false;
IRecipe recipe = recipes.get(recipeAt);
IRecipe recipe = ForgeRegistries.RECIPES.getValue(recipes.get(recipeAt));
renderCraftingRecipe(gui, recipe);
TextureManager render = Minecraft.getMinecraft().renderEngine;
@@ -127,7 +133,7 @@ public class PageCraftingRecipe extends PageRecipe {
for(int y = 0; y < shaped.recipeHeight; y++)
for(int x = 0; x < shaped.recipeWidth; x++)
renderItemAtGridPos(gui, 1 + x, 1 + y, shaped.recipeItems[y * shaped.recipeWidth + x], true);
renderItemAtGridPos(gui, 1 + x, 1 + y, shaped.recipeItems.get(y * shaped.recipeWidth + x).getMatchingStacks()[0], true);
} else if(recipe instanceof ShapedOreRecipe) {
ShapedOreRecipe shaped = (ShapedOreRecipe) recipe;
int width = ReflectionHelper.getPrivateValue(ShapedOreRecipe.class, shaped, 4);
@@ -135,9 +141,9 @@ public class PageCraftingRecipe extends PageRecipe {
for(int y = 0; y < height; y++)
for(int x = 0; x < width; x++) {
Object input = shaped.getInput()[y * width + x];
if(input != null)
renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List<ItemStack>) input).get(0), true);
Ingredient input = shaped.getIngredients().get(y * width + x);
if(input != Ingredient.EMPTY)
renderItemAtGridPos(gui, 1 + x, 1 + y, input.getMatchingStacks()[0], true);
}
oreDictRecipe = true;
@@ -152,7 +158,7 @@ public class PageCraftingRecipe extends PageRecipe {
if(index >= shapeless.recipeItems.size())
break drawGrid;
renderItemAtGridPos(gui, 1 + x, 1 + y, shapeless.recipeItems.get(index), true);
renderItemAtGridPos(gui, 1 + x, 1 + y, shapeless.recipeItems.get(index).getMatchingStacks()[0], true);
}
}
@@ -165,12 +171,12 @@ public class PageCraftingRecipe extends PageRecipe {
for(int x = 0; x < 3; x++) {
int index = y * 3 + x;
if(index >= shapeless.getRecipeSize())
break drawGrid;
/*if(index >= shapeless.getRecipeSize()) todo 1.12
break drawGrid;*/
Object input = shapeless.getInput().get(index);
if(input != null)
renderItemAtGridPos(gui, 1 + x, 1 + y, input instanceof ItemStack ? (ItemStack) input : ((List<ItemStack>) input).get(0), true);
Ingredient input = shapeless.getIngredients().get(index);
if(input != Ingredient.EMPTY)
renderItemAtGridPos(gui, 1 + x, 1 + y, input.getMatchingStacks()[0], true);
}
}
@@ -183,10 +189,10 @@ public class PageCraftingRecipe extends PageRecipe {
@Override
public List<ItemStack> getDisplayedRecipes() {
ArrayList<ItemStack> list = new ArrayList();
for(IRecipe r : recipes)
list.add(r.getRecipeOutput());
return list;
return recipes.stream()
.map(ForgeRegistries.RECIPES::getValue)
.map(IRecipe::getRecipeOutput)
.filter(s -> !s.isEmpty())
.collect(Collectors.toList());
}
}