mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-15 17:45:10 +00:00
pass through tesrs
This commit is contained in:
1 parent
a4d76b9335
commit
8aefdf57ea
84 files changed
+754
-857
No files matched your search
@@ -9,7 +9,7 @@
|
||||
package vazkii.botania.api;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
package vazkii.botania.api.item;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.fml.common.eventhandler.Event;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
|
||||
/**
|
||||
* Why would you ever want this ._.
|
||||
@@ -19,12 +20,12 @@ import net.minecraftforge.fml.common.eventhandler.Event;
|
||||
public class TinyPotatoRenderEvent extends Event {
|
||||
|
||||
public final TileEntity tile;
|
||||
public final String name;
|
||||
public final ITextComponent name;
|
||||
public final double x, y, z;
|
||||
public final float partTicks;
|
||||
public final int destroyStage;
|
||||
|
||||
public TinyPotatoRenderEvent(TileEntity tile, String name, double x, double y, double z, float partTicks, int destroyStage) {
|
||||
public TinyPotatoRenderEvent(TileEntity tile, ITextComponent name, double x, double y, double z, float partTicks, int destroyStage) {
|
||||
this.tile = tile;
|
||||
this.name = name;
|
||||
this.x = x;
|
||||
|
||||
@@ -27,7 +27,7 @@ public class Challenge {
|
||||
}
|
||||
|
||||
public void writeToNBT(NBTTagCompound cmp) {
|
||||
cmp.setBoolean(unlocalizedName, complete);
|
||||
cmp.putBoolean(unlocalizedName, complete);
|
||||
}
|
||||
|
||||
public void readFromNBT(NBTTagCompound cmp) {
|
||||
|
||||
@@ -33,7 +33,7 @@ public final class ModChallenges {
|
||||
for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants())
|
||||
challenges.put(level, new ArrayList<>());
|
||||
|
||||
addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.flower, 1, 6));
|
||||
addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.pinkFlower));
|
||||
addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.MUSIC_DISC_13));
|
||||
addChallenge(EnumChallengeLevel.EASY, "reedFarm", new ItemStack(Blocks.SUGAR_CANE));
|
||||
addChallenge(EnumChallengeLevel.EASY, "cobbleGen", new ItemStack(Blocks.COBBLESTONE));
|
||||
|
||||
@@ -14,8 +14,8 @@ import baubles.api.BaublesApi;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.MobEffects;
|
||||
@@ -127,7 +127,7 @@ public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
|
||||
@@ -41,13 +41,21 @@ import vazkii.botania.common.item.lens.ItemLens;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Map;
|
||||
|
||||
public final class ColorHandler {
|
||||
|
||||
public static void init() {
|
||||
BlockColors blocks = Minecraft.getInstance().getBlockColors();
|
||||
Map<IRegistryDelegate<Block>, IBlockColor> map = ReflectionHelper.getPrivateValue(BlockColors.class, blocks, "blockColorMap");
|
||||
Map<IRegistryDelegate<Block>, IBlockColor> map;
|
||||
try {
|
||||
Field f = BlockColors.class.getField("colors");
|
||||
f.setAccessible(true);
|
||||
map = (Map<IRegistryDelegate<Block>, IBlockColor>) f.get(blocks);
|
||||
} catch (ReflectiveOperationException ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
|
||||
// Steal vine colorer
|
||||
blocks.register(map.get(Blocks.VINE.delegate), ModBlocks.solidVines);
|
||||
@@ -59,7 +67,7 @@ public final class ColorHandler {
|
||||
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
|
||||
return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F);
|
||||
} else {
|
||||
return state.get(BotaniaStateProps.COLOR).getColorValue();
|
||||
return state.get(BotaniaStateProps.COLOR).colorValue;
|
||||
}
|
||||
},
|
||||
ModBlocks.manaPool, ModBlocks.creativePool, ModBlocks.dilutedPool, ModBlocks.fabulousPool
|
||||
@@ -75,7 +83,7 @@ public final class ColorHandler {
|
||||
);
|
||||
|
||||
// Petal Block
|
||||
blocks.register((state, world, pos, tintIndex) -> ((BlockPetalBlock) state.getBlock()).color.getColorValue(),
|
||||
blocks.register((state, world, pos, tintIndex) -> ((BlockPetalBlock) state.getBlock()).color.colorValue,
|
||||
ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue,
|
||||
ModBlocks.petalBlockYellow, ModBlocks.petalBlockLime, ModBlocks.petalBlockPink, ModBlocks.petalBlockGray,
|
||||
ModBlocks.petalBlockSilver, ModBlocks.petalBlockCyan, ModBlocks.petalBlockPurple, ModBlocks.petalBlockBlue,
|
||||
@@ -105,8 +113,8 @@ public final class ColorHandler {
|
||||
ModItems.lifeEssence, ModItems.gaiaIngot);
|
||||
|
||||
items.register((s, t) ->
|
||||
t == 1 ? EnumDyeColor.byId(ItemTwigWand.getColor1(s)).getColorValue()
|
||||
: t == 2 ? EnumDyeColor.byId(ItemTwigWand.getColor2(s)).getColorValue()
|
||||
t == 1 ? EnumDyeColor.byId(ItemTwigWand.getColor1(s)).colorValue
|
||||
: t == 2 ? EnumDyeColor.byId(ItemTwigWand.getColor2(s)).colorValue
|
||||
: -1,
|
||||
ModItems.twigWand);
|
||||
|
||||
|
||||
@@ -13,12 +13,13 @@ package vazkii.botania.client.core.handler;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EnumPlayerModelParts;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.api.item.IBaubleRender.Helper;
|
||||
@@ -89,7 +90,7 @@ public final class ContributorFancinessHandler implements LayerRenderer<EntityPl
|
||||
int i = Integer.parseInt(value);
|
||||
if(i < 0 || i >= 16)
|
||||
throw new NumberFormatException();
|
||||
flowerMap.put(key, new ItemStack(ModBlocks.flower, 1, i));
|
||||
flowerMap.put(key, new ItemStack(ModBlocks.getFlower(EnumDyeColor.byId(i))));
|
||||
} catch(NumberFormatException e) {
|
||||
flowerMap.put(key, ItemBlockSpecialFlower.ofType(new ResourceLocation(LibMisc.MOD_ID, value)));
|
||||
}
|
||||
|
||||
@@ -16,8 +16,10 @@ import net.minecraft.client.gui.GuiChat;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.gui.GuiTextField;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.registry.IRegistry;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
|
||||
@@ -45,16 +47,13 @@ public class CorporeaAutoCompleteHandler {
|
||||
|
||||
public static void updateItemList() {
|
||||
itemNames.clear();
|
||||
Iterator<Item> iterator = Item.REGISTRY.iterator();
|
||||
NonNullList<ItemStack> curList = NonNullList.create();
|
||||
|
||||
while(iterator.hasNext()) {
|
||||
Item item = iterator.next();
|
||||
|
||||
for (Item item : IRegistry.ITEM) {
|
||||
if(item != null && item.getGroup() != null) {
|
||||
curList.clear();
|
||||
try {
|
||||
item.getSubItems(null, curList);
|
||||
item.fillItemGroup(ItemGroup.SEARCH, curList);
|
||||
for(ItemStack stack : curList)
|
||||
itemNames.add(CorporeaHelper.stripControlCodes(stack.getDisplayName().getString().trim()));
|
||||
}
|
||||
@@ -126,7 +125,7 @@ public class CorporeaAutoCompleteHandler {
|
||||
stringbuilder.append(", ");
|
||||
}
|
||||
|
||||
Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new TextComponentString(stringbuilder.toString()), 1);
|
||||
Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new TextComponentString(stringbuilder.toString()), 1);
|
||||
isAutoCompleted = true;
|
||||
originalString = inputField.getText();
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ public class CorporeaInputHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void buttonPressed(KeyboardInputEvent.Post event) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if(mc.world == null || !supportedGuiFilter.test(mc.currentScreen)
|
||||
|| Keyboard.getEventKey() != ClientProxy.CORPOREA_REQUEST.getKeyCode()
|
||||
|| !Keyboard.getEventKeyState()
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
*/
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
|
||||
@@ -10,7 +10,7 @@ package vazkii.botania.client.core.handler;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.client.event.ModelRegistryEvent;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
@@ -54,16 +54,6 @@ public final class ModelHandler {
|
||||
ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE);
|
||||
|
||||
registerSubtiles();
|
||||
|
||||
for(Block block : Block.REGISTRY) {
|
||||
if(block instanceof IModelRegister)
|
||||
((IModelRegister) block).registerModels();
|
||||
}
|
||||
|
||||
for(Item item : Item.REGISTRY) {
|
||||
if(item instanceof IModelRegister)
|
||||
((IModelRegister) item).registerModels();
|
||||
}
|
||||
}
|
||||
|
||||
private static void registerSubtiles() {
|
||||
@@ -131,67 +121,5 @@ public final class ModelHandler {
|
||||
BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BERGAMUTE.toString()));
|
||||
}
|
||||
|
||||
public static void registerItemAllMeta(Item item, int range) {
|
||||
registerItemMetas(item, range, i -> item.getRegistryName().getPath());
|
||||
}
|
||||
|
||||
public static void registerItemAppendMeta(Item item, int maxExclusive, String loc) {
|
||||
registerItemMetas(item, maxExclusive, i -> loc + i);
|
||||
}
|
||||
|
||||
public static void registerItemMetas(Item item, int maxExclusive, IntFunction<String> metaToName) {
|
||||
for (int i = 0; i < maxExclusive; i++) {
|
||||
ModelLoader.setCustomModelResourceLocation(
|
||||
item, i,
|
||||
new ModelResourceLocation(LibMisc.MOD_ID + ":" + metaToName.apply(i), "inventory")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
return customStateMappers
|
||||
.getOrDefault(state.getBlock().delegate, fallbackMapper)
|
||||
.putStateModelLocations(state.getBlock())
|
||||
.get(state);
|
||||
}
|
||||
|
||||
public static void registerBlockToState(Block b, int meta, IBlockState state) {
|
||||
ModelLoader.setCustomModelResourceLocation(
|
||||
Item.getItemFromBlock(b),
|
||||
meta,
|
||||
getMrlForState(state)
|
||||
);
|
||||
}
|
||||
|
||||
public static void registerBlockToState(Block b, int maxExclusive) {
|
||||
for(int i = 0; i < maxExclusive; i++)
|
||||
registerBlockToState(b, i, b.getStateFromMeta(i));
|
||||
}
|
||||
|
||||
// Registers the ItemBlock to models/item/<registryname>#inventory
|
||||
public static void registerInventoryVariant(Block b) {
|
||||
ModelLoader.setCustomModelResourceLocation(
|
||||
Item.getItemFromBlock(b), 0,
|
||||
new ModelResourceLocation(b.getRegistryName(), "inventory"));
|
||||
}
|
||||
|
||||
// Registers the ItemBlock to a custom path in models/item/itemblock/
|
||||
public static void registerCustomItemblock(Block b, String path) {
|
||||
registerCustomItemblock(b, 1, i -> path);
|
||||
}
|
||||
|
||||
public static void registerCustomItemblock(Block b, int maxExclusive, IntFunction<String> metaToPath) {
|
||||
Item item = Item.getItemFromBlock(b);
|
||||
for (int i = 0; i < maxExclusive; i++) {
|
||||
ModelLoader.setCustomModelResourceLocation(
|
||||
item, i,
|
||||
new ModelResourceLocation(LibMisc.MOD_ID + ":itemblock/" + metaToPath.apply(i), "inventory")
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private ModelHandler() {}
|
||||
}
|
||||
@@ -74,7 +74,7 @@ public final class MultiblockRenderHandler {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) {
|
||||
if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().player) {
|
||||
if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getInstance().player) {
|
||||
anchor = event.getPos();
|
||||
angle = event.getEntityPlayer().getHorizontalFacing();
|
||||
event.setCanceled(true);
|
||||
|
||||
@@ -48,33 +48,33 @@ public final class PersistentVariableHelper {
|
||||
|
||||
List<GuiLexicon> bookmarks = GuiLexicon.bookmarks;
|
||||
int count = bookmarks.size();
|
||||
cmp.setInt(TAG_BOOKMARK_COUNT, count);
|
||||
cmp.putInt(TAG_BOOKMARK_COUNT, count);
|
||||
NBTTagCompound bookmarksCmp = new NBTTagCompound();
|
||||
for(int i = 0; i < count; i++) {
|
||||
GuiLexicon lex = bookmarks.get(i);
|
||||
NBTTagCompound bookmarkCmp = new NBTTagCompound();
|
||||
lex.serialize(bookmarkCmp);
|
||||
bookmarksCmp.setTag(TAG_BOOKMARK_PREFIX + i, bookmarkCmp);
|
||||
bookmarksCmp.put(TAG_BOOKMARK_PREFIX + i, bookmarkCmp);
|
||||
}
|
||||
cmp.setTag(TAG_BOOKMARKS, bookmarksCmp);
|
||||
cmp.put(TAG_BOOKMARKS, bookmarksCmp);
|
||||
|
||||
NBTTagCompound challengesCmp = new NBTTagCompound();
|
||||
for(Challenge c : ModChallenges.challengeLookup.values())
|
||||
c.writeToNBT(challengesCmp);
|
||||
cmp.setTag(TAG_CHALLENGES, challengesCmp);
|
||||
cmp.put(TAG_CHALLENGES, challengesCmp);
|
||||
|
||||
NBTTagCompound notesCmp = new NBTTagCompound();
|
||||
for(String s : GuiLexicon.notes.keySet()) {
|
||||
String note = GuiLexicon.notes.get(s);
|
||||
if(note != null && !note.trim().isEmpty())
|
||||
notesCmp.setString(s, note);
|
||||
notesCmp.putString(s, note);
|
||||
}
|
||||
cmp.setTag(TAG_LEXICON_NOTES, notesCmp);
|
||||
cmp.put(TAG_LEXICON_NOTES, notesCmp);
|
||||
|
||||
cmp.setBoolean(TAG_FIRST_LOAD, firstLoad);
|
||||
cmp.setBoolean(TAG_DOG, dog);
|
||||
cmp.setString(TAG_LAST_BOTANIA_VERSION, lastBotaniaVersion);
|
||||
cmp.setInt(TAG_LEXICON_GUI_SCALE, lexiconGuiScale);
|
||||
cmp.putBoolean(TAG_FIRST_LOAD, firstLoad);
|
||||
cmp.putBoolean(TAG_DOG, dog);
|
||||
cmp.putString(TAG_LAST_BOTANIA_VERSION, lastBotaniaVersion);
|
||||
cmp.putInt(TAG_LEXICON_GUI_SCALE, lexiconGuiScale);
|
||||
|
||||
injectNBTToFile(cmp, getCacheFile());
|
||||
}
|
||||
@@ -96,13 +96,13 @@ public final class PersistentVariableHelper {
|
||||
}
|
||||
}
|
||||
|
||||
if(cmp.hasKey(TAG_CHALLENGES)) {
|
||||
if(cmp.contains(TAG_CHALLENGES)) {
|
||||
NBTTagCompound challengesCmp = cmp.getCompound(TAG_CHALLENGES);
|
||||
for(Challenge c : ModChallenges.challengeLookup.values())
|
||||
c.readFromNBT(challengesCmp);
|
||||
}
|
||||
|
||||
if(cmp.hasKey(TAG_LEXICON_NOTES)) {
|
||||
if(cmp.contains(TAG_LEXICON_NOTES)) {
|
||||
NBTTagCompound notesCmp = cmp.getCompound(TAG_LEXICON_NOTES);
|
||||
Set<String> keys = notesCmp.keySet();
|
||||
GuiLexicon.notes.clear();
|
||||
@@ -110,9 +110,9 @@ public final class PersistentVariableHelper {
|
||||
GuiLexicon.notes.put(key, notesCmp.getString(key));
|
||||
}
|
||||
|
||||
lastBotaniaVersion = cmp.hasKey(TAG_LAST_BOTANIA_VERSION) ? cmp.getString(TAG_LAST_BOTANIA_VERSION) : "(N/A)";
|
||||
lastBotaniaVersion = cmp.contains(TAG_LAST_BOTANIA_VERSION) ? cmp.getString(TAG_LAST_BOTANIA_VERSION) : "(N/A)";
|
||||
|
||||
firstLoad = cmp.hasKey(TAG_FIRST_LOAD) ? cmp.getBoolean(TAG_FIRST_LOAD) : firstLoad;
|
||||
firstLoad = cmp.contains(TAG_FIRST_LOAD) ? cmp.getBoolean(TAG_FIRST_LOAD) : firstLoad;
|
||||
if(firstLoad)
|
||||
lastBotaniaVersion = LibMisc.VERSION;
|
||||
|
||||
|
||||
@@ -244,7 +244,7 @@ public final class RenderHelper {
|
||||
KeyBinding[] keys = Minecraft.getInstance().gameSettings.keyBindings;
|
||||
for(KeyBinding otherKey : keys)
|
||||
if(otherKey.getKeyDescription().equals(keyName)) {
|
||||
key = otherKey.getDisplayName();
|
||||
key = otherKey.func_197978_k();
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
@Override
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
PersistentVariableHelper.setCacheFile(new File(Minecraft.getMinecraft().gameDir, "BotaniaVars.dat"));
|
||||
PersistentVariableHelper.setCacheFile(new File(Minecraft.getInstance().gameDir, "BotaniaVars.dat"));
|
||||
try {
|
||||
PersistentVariableHelper.load();
|
||||
PersistentVariableHelper.save();
|
||||
@@ -226,10 +226,10 @@ public class ClientProxy implements IProxy {
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new);
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new);
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem(),
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, renderManager -> new RenderSnowballStack<>(renderManager, ModItems.thornChakram, Minecraft.getInstance().getItemRenderer(),
|
||||
entity -> entity.isFire() ? new ItemStack(ModItems.flareChakram) : new ItemStack(ModItems.thornChakram)));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.enderAirBottle, Minecraft.getMinecraft().getRenderItem()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.vineBall, Minecraft.getInstance().getItemRenderer()));
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowball<>(renderManager, ModItems.enderAirBottle, Minecraft.getInstance().getItemRenderer()));
|
||||
|
||||
ShaderHelper.initShaders();
|
||||
|
||||
@@ -239,7 +239,7 @@ public class ClientProxy implements IProxy {
|
||||
}
|
||||
|
||||
private void initAuxiliaryRender() {
|
||||
Map<String, RenderPlayer> skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap();
|
||||
Map<String, RenderPlayer> skinMap = Minecraft.getInstance().getRenderManager().getSkinMap();
|
||||
RenderPlayer render;
|
||||
render = skinMap.get("default");
|
||||
render.addLayer(new ContributorFancinessHandler());
|
||||
@@ -270,17 +270,17 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
@Override
|
||||
public boolean isTheClientPlayer(EntityLivingBase entity) {
|
||||
return entity == Minecraft.getMinecraft().player;
|
||||
return entity == Minecraft.getInstance().player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityPlayer getClientPlayer() {
|
||||
return Minecraft.getMinecraft().player;
|
||||
return Minecraft.getInstance().player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isClientPlayerWearingMonocle() {
|
||||
return ItemMonocle.hasMonocle(Minecraft.getMinecraft().player);
|
||||
return ItemMonocle.hasMonocle(Minecraft.getInstance().player);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -288,7 +288,7 @@ public class ClientProxy implements IProxy {
|
||||
if(ConfigHandler.lexicaOfflineMode)
|
||||
return false;
|
||||
IWikiProvider wiki = WikiHooks.getWikiFor(block);
|
||||
String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().player);
|
||||
String url = wiki.getWikiURL(world, pos, Minecraft.getInstance().player);
|
||||
if(url != null && !url.isEmpty()) {
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI(url));
|
||||
@@ -365,14 +365,14 @@ public class ClientProxy implements IProxy {
|
||||
if(!doParticle() && !fake)
|
||||
return;
|
||||
|
||||
FXSparkle sparkle = new FXSparkle(Minecraft.getMinecraft().world, x, y, z, size, r, g, b, m);
|
||||
FXSparkle sparkle = new FXSparkle(Minecraft.getInstance().world, x, y, z, size, r, g, b, m);
|
||||
sparkle.fake = fake;
|
||||
sparkle.setCanCollide(!fake);
|
||||
if(noclipEnabled)
|
||||
sparkle.setCanCollide(false);
|
||||
if(corruptSparkle)
|
||||
sparkle.corrupt = true;
|
||||
Minecraft.getMinecraft().effectRenderer.addEffect(sparkle);
|
||||
Minecraft.getInstance().effectRenderer.addEffect(sparkle);
|
||||
}
|
||||
|
||||
private static boolean distanceLimit = true;
|
||||
@@ -393,9 +393,9 @@ public class ClientProxy implements IProxy {
|
||||
if(!doParticle())
|
||||
return;
|
||||
|
||||
FXWisp wisp = new FXWisp(Minecraft.getMinecraft().world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul);
|
||||
FXWisp wisp = new FXWisp(Minecraft.getInstance().world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul);
|
||||
wisp.setSpeed(motionx, motiony, motionz);
|
||||
Minecraft.getMinecraft().effectRenderer.addEffect(wisp);
|
||||
Minecraft.getInstance().effectRenderer.addEffect(wisp);
|
||||
}
|
||||
|
||||
private boolean doParticle() {
|
||||
@@ -406,9 +406,9 @@ public class ClientProxy implements IProxy {
|
||||
return true;
|
||||
|
||||
float chance = 1F;
|
||||
if(Minecraft.getMinecraft().gameSettings.particleSetting == 1)
|
||||
if(Minecraft.getInstance().gameSettings.particleSetting == 1)
|
||||
chance = 0.6F;
|
||||
else if(Minecraft.getMinecraft().gameSettings.particleSetting == 2)
|
||||
else if(Minecraft.getInstance().gameSettings.particleSetting == 2)
|
||||
chance = 0.2F;
|
||||
|
||||
return chance == 1F || Math.random() < chance;
|
||||
@@ -416,7 +416,7 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
@Override
|
||||
public void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {
|
||||
Minecraft.getMinecraft().effectRenderer.addEffect(new FXLightning(Minecraft.getMinecraft().world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner));
|
||||
Minecraft.getInstance().effectRenderer.addEffect(new FXLightning(Minecraft.getInstance().world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -431,7 +431,7 @@ public class ClientProxy implements IProxy {
|
||||
|
||||
@Override
|
||||
public int getClientRenderDistance() {
|
||||
return Minecraft.getMinecraft().gameSettings.renderDistanceChunks;
|
||||
return Minecraft.getInstance().gameSettings.renderDistanceChunks;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -63,7 +63,7 @@ public class GuiFlowerBag extends GuiContainer {
|
||||
int x = guiLeft + slotf.xPos;
|
||||
int y = guiTop + slotf.yPos;
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemIntoGUI(stack, x, y);
|
||||
mc.getItemRenderer().renderItemIntoGUI(stack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
mc.fontRenderer.drawStringWithShadow("0", x + 11, y + 9, 0xFF6666);
|
||||
}
|
||||
|
||||
@@ -264,11 +264,11 @@ public class GuiLexicon extends GuiScreen {
|
||||
partialTicks = newPartialTicks;
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
mc.renderEngine.bindTexture(texture);
|
||||
mc.textureManager.bindTexture(texture);
|
||||
drawNotes(newPartialTicks);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
mc.renderEngine.bindTexture(texture);
|
||||
mc.textureManager.bindTexture(texture);
|
||||
drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight);
|
||||
|
||||
if(ClientProxy.jingleTheBells)
|
||||
@@ -290,10 +290,10 @@ public class GuiLexicon extends GuiScreen {
|
||||
|
||||
if(mc.player.getName().equals("haighyorkie")) {
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
mc.renderEngine.bindTexture(texture);
|
||||
mc.textureManager.bindTexture(texture);
|
||||
drawTexturedModalRect(left - 19, top + 42, 67, 180, 19, 26);
|
||||
if(xCoord >= left - 19 && xCoord < left && yCoord >= top + 62 && yCoord < top + 88) {
|
||||
mc.renderEngine.bindTexture(textureToff);
|
||||
mc.textureManager.bindTexture(textureToff);
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
GlStateManager.enableBlend();
|
||||
@@ -316,7 +316,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
super.drawScreen(xCoord, yCoord, newPartialTicks);
|
||||
|
||||
if(hasTutorialArrow) {
|
||||
mc.renderEngine.bindTexture(texture);
|
||||
mc.textureManager.bindTexture(texture);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 0.7F + (float) (Math.sin((ClientTickHandler.ticksInGame + newPartialTicks) * 0.3F) + 1) * 0.15F);
|
||||
@@ -363,7 +363,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
|
||||
public void drawBookmark(int x, int y, String s, boolean drawLeft, int color, int v) {
|
||||
// This function is called from the buttons so I can't use fontRenderer
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
FontRenderer font = Minecraft.getInstance().fontRenderer;
|
||||
boolean unicode = font.getUnicodeFlag();
|
||||
font.setUnicodeFlag(true);
|
||||
int l = font.getStringWidth(s);
|
||||
@@ -374,7 +374,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
fontOff = 2;
|
||||
}
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x + l / 2 + 3, y - 1, 54, v, 6, 11);
|
||||
@@ -391,7 +391,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
void drawHeader() {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
drawTexturedModalRect(left - 8, top + 9, 0, 224, 140, 31);
|
||||
|
||||
int color = 0xffd200;
|
||||
@@ -492,7 +492,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
} else {
|
||||
GuiLexicon bookmark = bookmarks.get(i).copy();
|
||||
if(!bookmark.getTitle().equals(getTitle())) {
|
||||
Minecraft.getMinecraft().displayGuiScreen(bookmark);
|
||||
Minecraft.getInstance().displayGuiScreen(bookmark);
|
||||
if(bookmark instanceof IParented)
|
||||
((IParented) bookmark).setParent(this);
|
||||
ClientTickHandler.notifyPageChange();
|
||||
@@ -512,7 +512,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
|
||||
public int bookmarkWidth(String b) {
|
||||
if(fontRenderer == null)
|
||||
fontRenderer = Minecraft.getMinecraft().fontRenderer;
|
||||
fontRenderer = Minecraft.getInstance().fontRenderer;
|
||||
|
||||
boolean unicode = fontRenderer.getUnicodeFlag();
|
||||
fontRenderer.setUnicodeFlag(true);
|
||||
@@ -546,7 +546,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
}
|
||||
|
||||
public static int getMaxAllowedScale() {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
int scale = mc.gameSettings.guiScale;
|
||||
mc.gameSettings.guiScale = 0;
|
||||
ScaledResolution res = new ScaledResolution(mc);
|
||||
|
||||
@@ -61,7 +61,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
|
||||
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
mc.getRenderItem().renderItemIntoGUI(challenge.icon, left + 18, top + 15);
|
||||
mc.getItemRenderer().renderItemIntoGUI(challenge.icon, left + 18, top + 15);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
|
||||
@@ -160,7 +160,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
|
||||
ClientTickHandler.notifyPageChange();
|
||||
break;
|
||||
case 3 :
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
String cmd = "/botania-share " + entry.getUnlocalizedName();
|
||||
|
||||
mc.ingameGUI.getChatGUI().addToSentMessages(cmd);
|
||||
|
||||
@@ -175,7 +175,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
|
||||
if(!searchField.getText().isEmpty()) {
|
||||
drawBookmark(left + 138, top + guiHeight - 24, " " + searchField.getText(), false);
|
||||
mc.renderEngine.bindTexture(texture);
|
||||
mc.textureManager.bindTexture(texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12);
|
||||
|
||||
@@ -238,15 +238,15 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
GlStateManager.enableRescaleNormal();
|
||||
ItemStack paper = new ItemStack(Items.PAPER, currentEntry.pages.size());
|
||||
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28);
|
||||
mc.getRenderItem().renderItemOverlays(mc.fontRenderer, paper, 14, -28);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(paper, 14, -28);
|
||||
mc.getItemRenderer().renderItemOverlays(mc.fontRenderer, paper, 14, -28);
|
||||
List<ItemStack> stacks = currentEntry.getDisplayedRecipes();
|
||||
|
||||
if(stacks.size() > 0) {
|
||||
int spaceForEach = Math.min(18, (width - 30) / stacks.size());
|
||||
for(int i = 0; i < stacks.size(); i++) {
|
||||
ItemStack stack = stacks.get(i);
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, 38 + spaceForEach * i, -28);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, 38 + spaceForEach * i, -28);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 109 : 98, 191, 11, 11);
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonBack extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, 36, k == 2 ? 180 : 189, 18, 9);
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ public class GuiButtonCategory extends GuiButtonLexicon {
|
||||
private final float time = 12F;
|
||||
|
||||
private final ShaderCallback shaderCallback = shader -> {
|
||||
TextureManager r = Minecraft.getMinecraft().renderEngine;
|
||||
TextureManager r = Minecraft.getInstance().textureManager;
|
||||
int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch");
|
||||
int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
|
||||
int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
|
||||
@@ -96,10 +96,10 @@ public class GuiButtonCategory extends GuiButtonLexicon {
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
|
||||
if(!boundStencil) { // Allow for the texture manager to take care of the ResourceLocation before we use it directly with gl
|
||||
mc.renderEngine.bindTexture(stencilResource);
|
||||
mc.textureManager.bindTexture(stencilResource);
|
||||
boundStencil = true;
|
||||
}
|
||||
mc.renderEngine.bindTexture(resource);
|
||||
mc.textureManager.bindTexture(resource);
|
||||
|
||||
int texture = 0;
|
||||
boolean shaders = ShaderHelper.useShaders();
|
||||
|
||||
@@ -37,7 +37,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon {
|
||||
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
par1Minecraft.getRenderItem().renderItemIntoGUI(challenge.icon, x, y);
|
||||
par1Minecraft.getItemRenderer().renderItemIntoGUI(challenge.icon, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 131 : 120, 180, 11, 11);
|
||||
|
||||
|
||||
@@ -36,10 +36,10 @@ public class GuiButtonDoot extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
par1Minecraft.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), x, y);
|
||||
par1Minecraft.getRenderItem().renderItemIntoGUI(new ItemStack(Items.FIREWORKS), x + 8, y + 2);
|
||||
par1Minecraft.getItemRenderer().renderItemIntoGUI(new ItemStack(ModItems.cacophonium), x, y);
|
||||
par1Minecraft.getItemRenderer().renderItemIntoGUI(new ItemStack(Items.FIREWORKS), x + 8, y + 2);
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
|
||||
if(enableDog) {
|
||||
dogPos += ClientTickHandler.delta * 10;
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(dogResource);
|
||||
par1Minecraft.textureManager.bindTexture(dogResource);
|
||||
float f = 1F / 64F;
|
||||
GlStateManager.translate(dogPos, 0, 0);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
@@ -108,7 +108,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
par1Minecraft.getRenderItem().renderItemIntoGUI(displayStack, x * 2 - 6, y * 2 + 4);
|
||||
par1Minecraft.getItemRenderer().renderItemIntoGUI(displayStack, x * 2 - 6, y * 2 + 4);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GlStateManager.enableBlend();
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class GuiButtonNotes extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 130 : 120, 191, 10, 11);
|
||||
|
||||
@@ -45,7 +45,7 @@ public class GuiButtonNotes extends GuiButtonLexicon {
|
||||
else {
|
||||
tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.showNotes"));
|
||||
if(parent.note != null && !parent.note.isEmpty())
|
||||
Minecraft.getMinecraft().fontRenderer.drawStringWithShadow("!", x + 10, y, 0xFF0000);
|
||||
Minecraft.getInstance().fontRenderer.drawStringWithShadow("!", x + 10, y, 0xFF0000);
|
||||
}
|
||||
|
||||
int tooltipY = (tooltip.size() - 1) * 10;
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonOptions extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 109 : 98, 180, 11, 11);
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ public class GuiButtonPage extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10);
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonScaleChange extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 152 : 141, 191, 11, 11);
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonShare extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 10 : 0 , 200, 10, 12);
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon {
|
||||
|
||||
boolean red = k == 2 || ClientTickHandler.ticksInGame % 10 < 5;
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, red ? 153 : 142, 180, 11, 11);
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon {
|
||||
hovered = par2 >= x && par3 >= y && par2 < x + width && par3 < y + height;
|
||||
int k = getHoverState(hovered);
|
||||
|
||||
par1Minecraft.renderEngine.bindTexture(GuiLexicon.texture);
|
||||
par1Minecraft.textureManager.bindTexture(GuiLexicon.texture);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(x, y, k == 2 ? 41 : 30, 200, 11, 11);
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ public class JEIBotaniaPlugin implements IModPlugin {
|
||||
CorporeaInputHandler.jeiPanelSupplier = () -> {
|
||||
Object o = jeiRuntime.getIngredientListOverlay().getIngredientUnderMouse();
|
||||
|
||||
if(o == null && Minecraft.getMinecraft().currentScreen == jeiRuntime.getRecipesGui())
|
||||
if(o == null && Minecraft.getInstance().currentScreen == jeiRuntime.getRecipesGui())
|
||||
o = jeiRuntime.getRecipesGui().getIngredientUnderMouse();
|
||||
|
||||
if(o instanceof ItemStack)
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory {
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlpha();
|
||||
|
||||
minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
minecraft.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex;
|
||||
Tessellator tess = Tessellator.getInstance();
|
||||
BufferBuilder wr = tess.getBuffer();
|
||||
|
||||
@@ -123,10 +123,10 @@ public class FloatingFlowerModel implements IBakedModel {
|
||||
|
||||
if(identifier.getPath().startsWith(MUNDANE_PREFIX)) {
|
||||
int meta = Integer.parseInt(identifier.getPath().substring(identifier.getPath().indexOf(MUNDANE_PREFIX) + MUNDANE_PREFIX.length()));
|
||||
flowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(ModBlocks.shinyFlower, 1, meta));
|
||||
flowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(new ItemStack(ModBlocks.shinyFlower, 1, meta));
|
||||
} else {
|
||||
ItemStack stack = ItemBlockSpecialFlower.ofType(identifier);
|
||||
IBakedModel specialFlowerModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack);
|
||||
IBakedModel specialFlowerModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(stack);
|
||||
flowerModel = specialFlowerModel.getOverrides().getModelWithOverrides(specialFlowerModel, stack, null, null);
|
||||
}
|
||||
|
||||
|
||||
@@ -4,10 +4,10 @@ import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormatElement;
|
||||
|
||||
@@ -3,11 +3,11 @@ package vazkii.botania.client.model;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
@@ -19,7 +19,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
|
||||
public class ModelSpinningCubes extends ModelBase {
|
||||
|
||||
final ModelRenderer spinningCube;
|
||||
private final ModelRenderer spinningCube;
|
||||
|
||||
public ModelSpinningCubes() {
|
||||
spinningCube = new ModelRenderer(this, 42, 0);
|
||||
@@ -69,7 +69,7 @@ public class ModelSpinningCubes extends ModelBase {
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
spinningCube.render(1F / 16F);
|
||||
|
||||
if(repeat < origRepeat) {
|
||||
|
||||
@@ -174,7 +174,7 @@ public class SpecialFlowerModel implements IUnbakedModel {
|
||||
|
||||
IBakedModel model = bakedBlockModels.get(subtileId == null ? BotaniaAPI.DUMMY_SUBTILE_NAME : subtileId);
|
||||
if(model == null)
|
||||
model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
|
||||
model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
|
||||
|
||||
return model.getQuads(state, face, rand);
|
||||
}
|
||||
@@ -196,7 +196,7 @@ public class SpecialFlowerModel implements IUnbakedModel {
|
||||
if(model == null)
|
||||
model = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack));
|
||||
if(model == null)
|
||||
model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(roseFallback);
|
||||
model = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(roseFallback);
|
||||
|
||||
return model;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class RenderBabylonWeapon extends Render<EntityBabylonWeapon> {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.pushMatrix();
|
||||
float s = 1.5F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
@@ -65,7 +65,7 @@ public class RenderBabylonWeapon extends Render<EntityBabylonWeapon> {
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, 240, 240);
|
||||
GlStateManager.disableLighting();
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
GlStateManager.popMatrix();
|
||||
@@ -74,7 +74,7 @@ public class RenderBabylonWeapon extends Render<EntityBabylonWeapon> {
|
||||
GlStateManager.shadeModel(GL11.GL_SMOOTH);
|
||||
GlStateManager.color(1F, 1F, 1F, chargeMul);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(babylon);
|
||||
Minecraft.getInstance().textureManager.bindTexture(babylon);
|
||||
|
||||
Tessellator tes = Tessellator.getInstance();
|
||||
ShaderHelper.useShader(ShaderHelper.halo);
|
||||
|
||||
@@ -68,8 +68,8 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
|
||||
GlStateManager.color(1F, 1F, 1F, absTime / 10);
|
||||
GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.world, null).getParticleTexture();
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
TextureAtlasSprite icon = Minecraft.getInstance().getItemRenderer().getItemModelWithOverrides(stack, entity.world, null).getParticleTexture();
|
||||
|
||||
if(icon != null) {
|
||||
float minU = icon.getMinU();
|
||||
|
||||
@@ -75,7 +75,7 @@ public class RenderDoppleganger extends RenderBiped<EntityDoppleganger> {
|
||||
@Nonnull
|
||||
@Override
|
||||
protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger entity) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
|
||||
if(!(mc.getRenderViewEntity() instanceof AbstractClientPlayer))
|
||||
return DefaultPlayerSkin.getDefaultSkinLegacy();
|
||||
|
||||
@@ -76,7 +76,7 @@ public class RenderPixie extends RenderLiving<EntityPixie> {
|
||||
char c0 = 61680;
|
||||
int j = c0 % 65536;
|
||||
int k = c0 / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j / 1.0F, k / 1.0F);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, j / 1.0F, k / 1.0F);
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, f1);
|
||||
return 1;
|
||||
|
||||
@@ -15,7 +15,7 @@ import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
@@ -27,36 +27,36 @@ import vazkii.botania.common.block.tile.TileAlfPortal;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal> {
|
||||
public class RenderTileAlfPortal extends TileEntityRenderer<TileAlfPortal> {
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if (!portal.getWorld().isBlockLoaded(portal.getPos(), false)
|
||||
|| portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal)
|
||||
return;
|
||||
|
||||
AlfPortalState state = portal.getWorld().getBlockState(portal.getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE);
|
||||
AlfPortalState state = portal.getWorld().getBlockState(portal.getPos()).get(BotaniaStateProps.ALFPORTAL_STATE);
|
||||
|
||||
if(state == AlfPortalState.OFF)
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.translate(-1F, 1F, 0.25F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
GlStateManager.translatef(-1F, 1F, 0.25F);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.enableCull();
|
||||
float alpha = (float) Math.min(1F, (Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 7D + 0.6D) * (Math.min(60, portal.ticksOpen) / 60F) * 0.5F;
|
||||
GlStateManager.color(1F, 1F, 1F, alpha);
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
if(state == AlfPortalState.ON_X) {
|
||||
GlStateManager.translate(1.25F, 0F, 1.75F);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(1.25F, 0F, 1.75F);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
}
|
||||
|
||||
GlStateManager.disableCull();
|
||||
@@ -64,14 +64,14 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.alfPortalTex, 3, 3, 240);
|
||||
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.translate(0F, 0F, 0.5F);
|
||||
GlStateManager.translatef(0F, 0F, 0.5F);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.alfPortalTex, 3, 3, 240);
|
||||
|
||||
GlStateManager.enableCull();
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,10 +13,10 @@ package vazkii.botania.client.render.tile;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -29,18 +29,18 @@ import vazkii.botania.common.block.tile.TileAltar;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
public class RenderTileAltar extends TileEntityRenderer<TileAltar> {
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if(!altar.getWorld().isBlockLoaded(altar.getPos(), false))
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5);
|
||||
GlStateManager.translated(d0 + 0.5, d1 + 1.5, d2 + 0.5);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
|
||||
boolean water = altar.hasWater();
|
||||
@@ -68,8 +68,8 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
float offsetPerPetal = 360 / petals;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(-0.05F, -0.5F, 0F);
|
||||
GlStateManager.scale(v, v, v);
|
||||
GlStateManager.translatef(-0.05F, -0.5F, 0F);
|
||||
GlStateManager.scalef(v, v, v);
|
||||
for(int i = 0; i < petals; i++) {
|
||||
float offset = offsetPerPetal * i;
|
||||
float deg = (int) (ticks / rotationModifier % 360F + offset);
|
||||
@@ -81,22 +81,22 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
float y = (float) Math.cos((ticks + 50 * i) / 5F) / 10F;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, z);
|
||||
GlStateManager.translatef(x, y, z);
|
||||
float xRotate = (float) Math.sin(ticks * rotationModifier) / 2F;
|
||||
float yRotate = (float) Math.max(0.6F, Math.sin(ticks * 0.1F) / 2F + 0.5F);
|
||||
float zRotate = (float) Math.cos(ticks * rotationModifier) / 2F;
|
||||
|
||||
v /= 2F;
|
||||
GlStateManager.translate(v, v, v);
|
||||
GlStateManager.rotate(deg, xRotate, yRotate, zRotate);
|
||||
GlStateManager.translate(-v, -v, -v);
|
||||
GlStateManager.translatef(v, v, v);
|
||||
GlStateManager.rotatef(deg, xRotate, yRotate, zRotate);
|
||||
GlStateManager.translatef(-v, -v, -v);
|
||||
v *= 2F;
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
ItemStack stack = altar.getItemHandler().getStackInSlot(i);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -105,25 +105,25 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
}
|
||||
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Fluid fluid = lava ? FluidRegistry.LAVA : FluidRegistry.WATER;
|
||||
int brightness = lava ? 240 : -1;
|
||||
float alpha = lava ? 1F : 0.7F;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.disableAlphaTest();
|
||||
if(lava)
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.color(1F, 1F, 1F, alpha);
|
||||
GlStateManager.translate(w, -0.3F, w);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
GlStateManager.translatef(w, -0.3F, w);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
|
||||
renderIcon(0, 0, fluid.getStill(), 16, 16, brightness);
|
||||
if(lava)
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
@@ -131,7 +131,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
|
||||
}
|
||||
|
||||
public void renderIcon(int par1, int par2, ResourceLocation loc, int par4, int par5, int brightness) {
|
||||
TextureAtlasSprite par3Icon = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(loc.toString());
|
||||
TextureAtlasSprite par3Icon = Minecraft.getInstance().getTextureMap().getAtlasSprite(loc.toString());
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
|
||||
//if(brightness != -1)
|
||||
|
||||
@@ -12,8 +12,8 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
@@ -21,13 +21,13 @@ import vazkii.botania.common.block.tile.TileAnimatedTorch;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer<TileAnimatedTorch> {
|
||||
public class RenderTileAnimatedTorch extends TileEntityRenderer<TileAnimatedTorch> {
|
||||
|
||||
@Override
|
||||
public void render(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage, float unused) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
public void render(TileAnimatedTorch te, double x, double y, double z, float partialTicks, int destroyStage) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, z);
|
||||
GlStateManager.translated(x, y, z);
|
||||
|
||||
boolean hasWorld = te != null && te.getWorld() != null;
|
||||
int wtime = !hasWorld ? 0 : ClientTickHandler.ticksInGame;
|
||||
@@ -38,16 +38,16 @@ public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer<TileAnima
|
||||
float xt = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F;
|
||||
float yt = 0.1F + (float) (Math.sin(time * 0.04F) + 1F) * 0.05F;
|
||||
float zt = 0.5F + (float) Math.sin(time * 0.05F) * 0.025F;
|
||||
GlStateManager.translate(xt, yt, zt);
|
||||
GlStateManager.translatef(xt, yt, zt);
|
||||
|
||||
GlStateManager.scale(2F, 2F, 2F);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(2F, 2F, 2F);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
float rotation = (float) te.rotation;
|
||||
if(te.rotating)
|
||||
rotation += te.anglePerTick * partialTicks;
|
||||
|
||||
GlStateManager.rotate(rotation, 0F, 0F, 1F);
|
||||
mc.getRenderItem().renderItem(new ItemStack(Blocks.REDSTONE_TORCH), ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.rotatef(rotation, 0F, 0F, 1F);
|
||||
mc.getItemRenderer().renderItem(new ItemStack(Blocks.REDSTONE_TORCH), ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@ package vazkii.botania.client.render.tile;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -30,7 +30,7 @@ import vazkii.botania.common.block.tile.TileAvatar;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
|
||||
public class RenderTileAvatar extends TileEntityRenderer<TileAvatar> {
|
||||
|
||||
private static final float[] ROTATIONS = new float[] {
|
||||
180F, 0F, 90F, 270F
|
||||
@@ -40,7 +40,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
|
||||
private static final ModelAvatar model = new ModelAvatar();
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if (avatar != null)
|
||||
if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false)
|
||||
|| avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar)
|
||||
@@ -48,22 +48,22 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
EnumFacing facing = avatar != null && avatar.getWorld() != null
|
||||
? avatar.getWorld().getBlockState(avatar.getPos()).getValue(BotaniaStateProps.CARDINALS)
|
||||
? avatar.getWorld().getBlockState(avatar.getPos()).get(BotaniaStateProps.CARDINALS)
|
||||
: EnumFacing.SOUTH;
|
||||
|
||||
GlStateManager.translate(0.5F, 1.6F, 0.5F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0.5F, 1.6F, 0.5F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.rotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F);
|
||||
model.render();
|
||||
|
||||
if (avatar == null) {
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
return;
|
||||
@@ -72,34 +72,34 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
|
||||
ItemStack stack = avatar.getItemHandler().getStackInSlot(0);
|
||||
if(!stack.isEmpty()) {
|
||||
GlStateManager.pushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
float s = 0.6F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.translate(-0.5F, 2F, -0.25F);
|
||||
GlStateManager.rotate(-70, 1, 0, 0);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
GlStateManager.translatef(-0.5F, 2F, -0.25F);
|
||||
GlStateManager.rotatef(-70, 1, 0, 0);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(wieldable.getOverlayResource(avatar, stack));
|
||||
Minecraft.getInstance().textureManager.bindTexture(wieldable.getOverlayResource(avatar, stack));
|
||||
s = 1.01F;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.translate(0F, -0.01F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
GlStateManager.translatef(0F, -0.01F, 0F);
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F;
|
||||
GlStateManager.color(1F, 1F, 1F, alpha + 0.183F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha + 0.183F);
|
||||
model.render();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelBellows;
|
||||
@@ -21,7 +21,7 @@ import vazkii.botania.common.block.tile.mana.TileBellows;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {
|
||||
public class RenderTileBellows extends TileEntityRenderer<TileBellows> {
|
||||
|
||||
private static final float[] ROTATIONS = new float[] {
|
||||
180F, 0F, 90F, 270F
|
||||
@@ -31,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {
|
||||
private static final ModelBellows model = new ModelBellows();
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if (bellows != null)
|
||||
if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false)
|
||||
|| bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows)
|
||||
@@ -39,18 +39,18 @@ public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
int meta = bellows != null && bellows.getWorld() != null ? bellows.getBlockMetadata() : 0;
|
||||
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.rotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F);
|
||||
model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : bellows.movePos + bellows.moving * f + 0.1F)));
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -12,9 +12,9 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
@@ -24,23 +24,23 @@ import vazkii.botania.common.block.tile.TileBrewery;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
|
||||
public class RenderTileBrewery extends TileEntityRenderer<TileBrewery> {
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY);
|
||||
final ModelBrewery model = new ModelBrewery();
|
||||
public TileBrewery brewery;
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
this.brewery = brewery;
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.translate(0.5F, -1.5F, -0.5F);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.translatef(0.5F, -1.5F, -0.5F);
|
||||
|
||||
double time = ClientTickHandler.ticksInGame + f;
|
||||
|
||||
@@ -51,16 +51,16 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
|
||||
|
||||
public void renderItemStack(ItemStack stack) {
|
||||
if(!stack.isEmpty()) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
GlStateManager.pushMatrix();
|
||||
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
float s = 0.25F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.scale(1F / s, 1F / s, 1F / s);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
mc.getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.scalef(1F / s, 1F / s, 1F / s);
|
||||
GlStateManager.popMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,18 +13,18 @@ package vazkii.botania.client.render.tile;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.common.block.tile.TileCocoon;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileCocoon extends TileEntitySpecialRenderer<TileCocoon> {
|
||||
public class RenderTileCocoon extends TileEntityRenderer<TileCocoon> {
|
||||
|
||||
@Override
|
||||
public void render(@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 rot = 0F;
|
||||
float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F;
|
||||
if(cocoon.timePassed % modval < 10) {
|
||||
@@ -37,16 +37,16 @@ public class RenderTileCocoon extends TileEntitySpecialRenderer<TileCocoon> {
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2 + 1);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.translate(0.5F, 0, 0F);
|
||||
GlStateManager.rotate(rot, 1F, 0F, 0F);
|
||||
GlStateManager.translate(-0.5F, 0, 0F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2 + 1);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.translatef(0.5F, 0, 0F);
|
||||
GlStateManager.rotatef(rot, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(-0.5F, 0, 0F);
|
||||
IBlockState state = cocoon.getWorld().getBlockState(cocoon.getPos());
|
||||
IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(state);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
+22
-22
@@ -20,7 +20,7 @@ import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.entity.RenderEntityItem;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -42,20 +42,20 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<TileCorporeaCrystalCube> {
|
||||
public class RenderTileCorporeaCrystalCube extends TileEntityRenderer<TileCorporeaCrystalCube> {
|
||||
|
||||
private EntityItem entity = null;
|
||||
private RenderEntityItem itemRenderer = null;
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
ItemStack stack = ItemStack.EMPTY;
|
||||
if (cube != null) {
|
||||
if(entity == null)
|
||||
entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.STONE));
|
||||
|
||||
if(itemRenderer == null)
|
||||
itemRenderer = new RenderEntityItem(Minecraft.getMinecraft().getRenderManager(), Minecraft.getMinecraft().getRenderItem()) {
|
||||
itemRenderer = new RenderEntityItem(Minecraft.getInstance().getRenderManager(), Minecraft.getInstance().getItemRenderer()) {
|
||||
@Override
|
||||
public boolean shouldBob() {
|
||||
return false;
|
||||
@@ -70,27 +70,27 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
|
||||
double time = ClientTickHandler.ticksInGame + f;
|
||||
double worldTicks = cube == null || cube.getWorld() == null ? 0 : time;
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0 * 1.55) * 0.025F, 0F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.translatef(0F, (float) Math.sin(worldTicks / 20.0 * 1.55) * 0.025F, 0F);
|
||||
if(!stack.isEmpty()) {
|
||||
GlStateManager.pushMatrix();
|
||||
float s = stack.getItem() instanceof ItemBlock ? 0.7F : 0.5F;
|
||||
GlStateManager.translate(0F, 0.8F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(0F, 0.8F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
GlStateManager.rotatef(180F, 0F, 0F, 1F);
|
||||
itemRenderer.doRender(entity, 0, 0, 0, 1F, f);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
|
||||
if(!stack.isEmpty()) {
|
||||
int count = cube.getItemCount();
|
||||
@@ -108,24 +108,24 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
|
||||
int colorShade = (color & 16579836) >> 2 | color & -16777216;
|
||||
|
||||
float s = 1F / 64F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
GlStateManager.disableLighting();
|
||||
int l = mc.fontRenderer.getStringWidth(countStr);
|
||||
|
||||
GlStateManager.translate(0F, 55F, 0F);
|
||||
GlStateManager.translatef(0F, 55F, 0F);
|
||||
float tr = -16.5F;
|
||||
for(int i = 0; i < 4; i++) {
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0F, 0F, tr);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0F, 0F, tr);
|
||||
mc.fontRenderer.drawString(countStr, -l / 2, 0, color);
|
||||
GlStateManager.translate(0F, 0F, 0.1F);
|
||||
GlStateManager.translatef(0F, 0F, 0.1F);
|
||||
mc.fontRenderer.drawString(countStr, -l / 2 + 1, 1, colorShade);
|
||||
GlStateManager.translate(0F, 0F, -tr - 0.1F);
|
||||
GlStateManager.translatef(0F, 0F, -tr - 0.1F);
|
||||
}
|
||||
GlStateManager.enableLighting();
|
||||
}
|
||||
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -161,7 +161,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
|
||||
{
|
||||
return;
|
||||
}
|
||||
if(blockRenderer == null) blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher();
|
||||
if(blockRenderer == null) blockRenderer = Minecraft.getInstance().getBlockRendererDispatcher();
|
||||
BlockPos pos = te.getPos();
|
||||
IBlockReader world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos);
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
|
||||
@@ -11,9 +11,9 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.model.ModelEnderCrystal;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.entity.model.ModelEnderCrystal;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
@@ -21,26 +21,26 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorporeaIndex> {
|
||||
public class RenderTileCorporeaIndex extends TileEntityRenderer<TileCorporeaIndex> {
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX);
|
||||
final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
|
||||
private final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
|
||||
public static boolean move = true;
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
move = index != null;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x + 0.5, y, z + 0.5);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
GlStateManager.translated(x + 0.5, y, z + 0.5);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
|
||||
float translation = move ? (float) ((Math.cos((index.ticksWithCloseby + (index.hasCloseby ? partticks : 0)) / 10F) * 0.5 + 0.5) * 0.25) : 0F;
|
||||
float rotation = move ? index.ticks * 2 + partticks : 0F;
|
||||
float scale = 0.6F;
|
||||
GlStateManager.scale(scale, scale, scale);
|
||||
GlStateManager.scalef(scale, scale, scale);
|
||||
crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F);
|
||||
GlStateManager.scale(1F / scale, 1F / scale, 1F / scale);
|
||||
GlStateManager.scalef(1F / scale, 1F / scale, 1F / scale);
|
||||
|
||||
if(index != null && index.closeby > 0F) {
|
||||
float starScale = 0.02F;
|
||||
@@ -51,20 +51,20 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorpo
|
||||
int color = 0xFF00FF;
|
||||
int seed = index.getPos().getX() ^ index.getPos().getY() ^ index.getPos().getZ();
|
||||
|
||||
GlStateManager.translate(starX, 0.3, starZ);
|
||||
GlStateManager.translated(starX, 0.3, starZ);
|
||||
RenderHelper.renderStar(color, starScale, starScale, starScale, seed);
|
||||
GlStateManager.translate(-starX * 2, 0, -starZ * 2);
|
||||
GlStateManager.translated(-starX * 2, 0, -starZ * 2);
|
||||
RenderHelper.renderStar(color, starScale, starScale, starScale, seed);
|
||||
GlStateManager.translate(starX, 0, starZ);
|
||||
GlStateManager.translated(starX, 0, starZ);
|
||||
|
||||
rads = -rads;
|
||||
starX = Math.cos(rads) * starRadius;
|
||||
starZ = Math.sin(rads) * starRadius;
|
||||
GlStateManager.translate(starX, 0, starZ);
|
||||
GlStateManager.translated(starX, 0, starZ);
|
||||
RenderHelper.renderStar(color, starScale, starScale, starScale, seed);
|
||||
GlStateManager.translate(-starX * 2, 0, -starZ * 2);
|
||||
GlStateManager.translated(-starX * 2, 0, -starZ * 2);
|
||||
RenderHelper.renderStar(color, starScale, starScale, starScale, seed);
|
||||
GlStateManager.translate(starX, 0, starZ);
|
||||
GlStateManager.translated(starX, 0, starZ);
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.entity.Render;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
@@ -28,12 +28,12 @@ import vazkii.botania.common.block.tile.TileEnchanter;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter> {
|
||||
public class RenderTileEnchanter extends TileEntityRenderer<TileEnchanter> {
|
||||
|
||||
private EntityItem item;
|
||||
|
||||
@Override
|
||||
public void render(@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 alphaMod = 0F;
|
||||
|
||||
if(enchanter.stage == TileEnchanter.State.GATHER_MANA)
|
||||
@@ -50,36 +50,36 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
|
||||
item.age = ClientTickHandler.ticksInGame;
|
||||
item.setItem(enchanter.itemToEnchant);
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(0.5F, 1.25F, 0.5F);
|
||||
((Render) Minecraft.getMinecraft().getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(item, d0, d1, d2, 1F, f);
|
||||
GlStateManager.translate(-0.5F, -1.25F, -0.5F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translatef(0.5F, 1.25F, 0.5F);
|
||||
((Render) Minecraft.getInstance().getRenderManager().entityRenderMap.get(EntityItem.class)).doRender(item, d0, d1, d2, 1F, f);
|
||||
GlStateManager.translatef(-0.5F, -1.25F, -0.5F);
|
||||
}
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(-2F, -2F, -0.001F);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(-2F, -2F, -0.001F);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlphaTest();
|
||||
float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.4D) * alphaMod;
|
||||
|
||||
if(alpha > 0) {
|
||||
if(ShaderHelper.useShaders())
|
||||
GlStateManager.color(1F, 1F, 1F, alpha);
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
else {
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
GlStateManager.color(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
GlStateManager.color4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
|
||||
}
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
if(enchanter.stage == TileEnchanter.State.DO_ENCHANT || enchanter.stage == TileEnchanter.State.RESET) {
|
||||
int ticks = enchanter.stageTicks + enchanter.stage3EndTicks;
|
||||
@@ -87,10 +87,10 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
|
||||
float yTranslation = Math.min(20, ticks) / 20F * 1.15F;
|
||||
float scale = ticks < 10 ? 1F : 1F - Math.min(20, ticks - 10) / 20F * 0.75F;
|
||||
|
||||
GlStateManager.translate(2.5F, 2.5F, -yTranslation);
|
||||
GlStateManager.scale(scale, scale, 1F);
|
||||
GlStateManager.rotate(angle, 0F, 0F, 1F);
|
||||
GlStateManager.translate(-2.5F, -2.5F, 0F);
|
||||
GlStateManager.translatef(2.5F, 2.5F, -yTranslation);
|
||||
GlStateManager.scalef(scale, scale, 1F);
|
||||
GlStateManager.rotatef(angle, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(-2.5F, -2.5F, 0F);
|
||||
}
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.enchanterRune);
|
||||
@@ -98,9 +98,9 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
|
||||
ShaderHelper.releaseShader();
|
||||
}
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -14,10 +14,10 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.BlockRendererDispatcher;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
@@ -25,10 +25,10 @@ import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Random;
|
||||
|
||||
public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
|
||||
public class RenderTileFloatingFlower extends TileEntityRenderer {
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if(ConfigHandler.staticFloaters)
|
||||
return;
|
||||
|
||||
@@ -37,22 +37,22 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
|
||||
return;
|
||||
|
||||
|
||||
BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher();
|
||||
BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
double worldTime = ClientTickHandler.ticksInGame + t;
|
||||
if(tile.getWorld() != null)
|
||||
worldTime += new Random(tile.getPos().hashCode()).nextInt(1000);
|
||||
|
||||
GlStateManager.translate(0.5F, 0, 0.5F);
|
||||
GlStateManager.rotate(-((float) worldTime * 0.5F), 0F, 1F, 0F);
|
||||
GlStateManager.translate(-0.5, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0.5);
|
||||
GlStateManager.translatef(0.5F, 0, 0.5F);
|
||||
GlStateManager.rotatef(-((float) worldTime * 0.5F), 0F, 1F, 0F);
|
||||
GlStateManager.translated(-0.5, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0.5);
|
||||
|
||||
GlStateManager.rotate(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F);
|
||||
GlStateManager.rotatef(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
IBlockState state = tile.getWorld().getBlockState(tile.getPos());
|
||||
state = state.getBlock().getExtendedState(state, tile.getWorld(), tile.getPos());
|
||||
|
||||
@@ -32,7 +32,7 @@ import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileGaiaHead extends TileEntitySkullRenderer {
|
||||
@Override
|
||||
public void render(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) {
|
||||
ShaderHelper.useShader(ShaderHelper.doppleganger, RenderDoppleganger.defaultCallback);
|
||||
|
||||
// Null-safe copy of super
|
||||
@@ -52,7 +52,7 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer {
|
||||
|
||||
@Override
|
||||
public void renderSkull(float x, float y, float z, @Nonnull EnumFacing facing, float rotation, int skullType, @Nullable GameProfile profile, int destroyStage, float animateTicks) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
Entity view = mc.getRenderViewEntity();
|
||||
|
||||
profile = null;
|
||||
|
||||
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -24,19 +24,19 @@ import vazkii.botania.common.block.tile.TileHourglass;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Random;
|
||||
|
||||
public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass> {
|
||||
public class RenderTileHourglass extends TileEntityRenderer<TileHourglass> {
|
||||
|
||||
final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS);
|
||||
final ModelHourglass model = new ModelHourglass();
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
Minecraft.getInstance().textureManager.bindTexture(texture);
|
||||
boolean hasWorld = hourglass != null && hourglass.getWorld() != null;
|
||||
int wtime = !hasWorld ? 0 : ClientTickHandler.ticksInGame;
|
||||
if(wtime != 0)
|
||||
@@ -51,16 +51,16 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass
|
||||
float activeFraction = stack.isEmpty() ? 0 : hourglass.lastFraction + (hourglass.timeFraction - hourglass.lastFraction) * ticks;
|
||||
float fract1 = stack.isEmpty() ? 0 : activeFraction;
|
||||
float fract2 = stack.isEmpty() ? 0 : 1F - activeFraction;
|
||||
GlStateManager.translate(x, y, z);
|
||||
GlStateManager.translatef(x, y, z);
|
||||
|
||||
float rot = hasWorld && hourglass.flip ? 180F : 1F;
|
||||
if(hasWorld && hourglass.flipTicks > 0)
|
||||
rot += (hourglass.flipTicks - ticks) * (180F / 4F);
|
||||
GlStateManager.rotate(rot, 0F, 0F, 1F);
|
||||
GlStateManager.rotatef(rot, 0F, 0F, 1F);
|
||||
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
model.render(fract1, fract2, hasWorld && hourglass.flip, hasWorld ? hourglass.getColor() : 0);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@ package vazkii.botania.client.render.tile;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -25,13 +25,13 @@ import vazkii.botania.common.block.tile.TileIncensePlate;
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Map;
|
||||
|
||||
public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncensePlate> {
|
||||
public class RenderTileIncensePlate extends TileEntityRenderer<TileIncensePlate> {
|
||||
|
||||
private static final Map<EnumFacing, Integer> ROTATIONS = ImmutableMap.of(EnumFacing.NORTH, 180, EnumFacing.SOUTH, 0, EnumFacing.WEST, 270, EnumFacing.EAST, 90);
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if(!plate.getWorld().isBlockLoaded(plate.getPos(), false)
|
||||
|| plate.getWorld().getBlockState(plate.getPos()).getBlock() != ModBlocks.incensePlate)
|
||||
return;
|
||||
@@ -40,19 +40,19 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
|
||||
if(stack.isEmpty())
|
||||
return;
|
||||
|
||||
EnumFacing facing = plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS);
|
||||
EnumFacing facing = plate.getWorld().getBlockState(plate.getPos()).get(BotaniaStateProps.CARDINALS);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.rotate(ROTATIONS.get(facing), 0F, 1F, 0F);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.rotatef(ROTATIONS.get(facing), 0F, 1F, 0F);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
float s = 0.6F;
|
||||
GlStateManager.translate(-0.11F, -1.35F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.translatef(-0.11F, -1.35F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -10,12 +10,13 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
@@ -23,23 +24,28 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.block.BlockLightRelay;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileLightRelay;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.HashMap;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRelay> {
|
||||
public class RenderTileLightRelay extends TileEntityRenderer<TileLightRelay> {
|
||||
|
||||
private static Map<LuminizerVariant, TextureAtlasSprite> sprites = new HashMap();
|
||||
private static Map<LuminizerVariant, TextureAtlasSprite> sprites = new EnumMap<>(LuminizerVariant.class);
|
||||
|
||||
@Override
|
||||
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)
|
||||
public void render(@Nonnull TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) {
|
||||
if(!tile.getWorld().isBlockLoaded(tile.getPos(), false))
|
||||
return;
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
IBlockState state = tile.getWorld().getBlockState(tile.getPos());
|
||||
if(!(state.getBlock() instanceof BlockLightRelay))
|
||||
return;
|
||||
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if(sprites.isEmpty()) {
|
||||
sprites.put(LuminizerVariant.DEFAULT, MiscellaneousIcons.INSTANCE.lightRelayWorldIcon);
|
||||
sprites.put(LuminizerVariant.DETECTOR, MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed);
|
||||
@@ -47,39 +53,39 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRel
|
||||
sprites.put(LuminizerVariant.TOGGLE, MiscellaneousIcons.INSTANCE.lightRelayWorldIconPurple);
|
||||
}
|
||||
|
||||
TextureAtlasSprite iicon = sprites.get(tile.getWorld().getBlockState(tile.getPos()).getValue(BotaniaStateProps.LUMINIZER_VARIANT));
|
||||
TextureAtlasSprite iicon = sprites.get(((BlockLightRelay) state.getBlock()).variant);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x + 0.5, y + 0.3, z + 0.5);
|
||||
GlStateManager.translated(x + 0.5, y + 0.3, z + 0.5);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.05F);
|
||||
|
||||
double time = ClientTickHandler.ticksInGame + pticks;
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
float scale = 0.75F;
|
||||
GlStateManager.scale(scale, scale, scale);
|
||||
GlStateManager.scalef(scale, scale, scale);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
float r = 180.0F - mc.getRenderManager().playerViewY;
|
||||
GlStateManager.rotate(r, 0F, 1F, 0F);
|
||||
GlStateManager.rotate(-mc.getRenderManager().playerViewX, 1F, 0F, 0F);
|
||||
GlStateManager.rotatef(r, 0F, 1F, 0F);
|
||||
GlStateManager.rotatef(-mc.getRenderManager().playerViewX, 1F, 0F, 0F);
|
||||
|
||||
float off = 0.25F;
|
||||
GlStateManager.translate(0F, off, 0F);
|
||||
GlStateManager.rotate((float) time, 0F, 0F, 1F);
|
||||
GlStateManager.translate(0F, -off, 0F);
|
||||
GlStateManager.translatef(0F, off, 0F);
|
||||
GlStateManager.rotatef((float) time, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(0F, -off, 0F);
|
||||
|
||||
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
ShaderHelper.useShader(ShaderHelper.halo);
|
||||
renderIcon(tessellator, iicon);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -15,10 +15,10 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -32,19 +32,20 @@ import vazkii.botania.common.block.mana.BlockPool;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.awt.Color;
|
||||
import java.util.Random;
|
||||
|
||||
public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
public class RenderTilePool extends TileEntityRenderer<TilePool> {
|
||||
|
||||
// Overrides for when we call this TESR without an actual pool
|
||||
public static BlockPool.Variant forceVariant = BlockPool.Variant.DEFAULT;
|
||||
public static int forceManaNumber = -1;
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TilePool pool, double d0, double d1, double d2, float f, int digProgress, float unused) {
|
||||
public void render(@Nullable TilePool pool, double d0, double d1, double d2, float f, int digProgress) {
|
||||
if(pool != null && (!pool.getWorld().isBlockLoaded(pool.getPos(), false)
|
||||
|| !(pool.getBlockType() instanceof BlockPool)))
|
||||
|| !(pool.getBlockState().getBlock() instanceof BlockPool)))
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
@@ -53,16 +54,16 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
GlStateManager.enableRescaleNormal();
|
||||
float a = MultiblockRenderHandler.rendering ? 0.6F : 1F;
|
||||
|
||||
GlStateManager.color(1F, 1F, 1F, a);
|
||||
GlStateManager.color4f(1F, 1F, 1F, a);
|
||||
if (pool == null) { // A null pool means we are calling the TESR without a pool (on a minecart). Adjust accordingly
|
||||
GlStateManager.translate(0, 0, -1);
|
||||
GlStateManager.translatef(0, 0, -1);
|
||||
} else {
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
}
|
||||
|
||||
boolean fab = pool == null ? forceVariant == BlockPool.Variant.FABULOUS : ((BlockPool) pool.getBlockType()).variant == BlockPool.Variant.FABULOUS;
|
||||
boolean fab = pool == null ? forceVariant == BlockPool.Variant.FABULOUS : ((BlockPool) pool.getBlockState().getBlock()).variant == BlockPool.Variant.FABULOUS;
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
int color = 0xFFFFFF;
|
||||
|
||||
if (fab) {
|
||||
@@ -76,12 +77,12 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
int red = (color & 0xFF0000) >> 16;
|
||||
int green = (color & 0xFF00) >> 8;
|
||||
int blue = color & 0xFF;
|
||||
IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(pool == null ? poolForVariant(forceVariant) : pool.getWorld().getBlockState(pool.getPos()));
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F);
|
||||
IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(pool == null ? poolForVariant(forceVariant) : pool.getWorld().getBlockState(pool.getPos()));
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F);
|
||||
}
|
||||
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.color(1, 1, 1, a);
|
||||
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.color4f(1, 1, 1, a);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
|
||||
int mana = pool == null ? forceManaNumber : pool.getCurrentMana();
|
||||
@@ -103,15 +104,15 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.color(1F, 1F, 1F, a * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2));
|
||||
GlStateManager.translate(-0.5F, -1F - 0.43F, -0.5F);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, a * (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2));
|
||||
GlStateManager.translatef(-0.5F, -1F - 0.43F, -0.5F);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
|
||||
renderIcon(0, 0, overlay, 16, 16, 240);
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
@@ -123,17 +124,17 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.color(1F, 1F, 1F, a);
|
||||
GlStateManager.translate(w, -1F - (0.43F - waterLevel), w);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, a);
|
||||
GlStateManager.translatef(w, -1F - (0.43F - waterLevel), w);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.manaPool);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.manaWater, 16, 16, 240);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -12,9 +12,9 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
@@ -22,25 +22,23 @@ import vazkii.botania.common.block.tile.mana.TilePrism;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
//import vazkii.botania.client.render.item.RenderLens;
|
||||
|
||||
public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {
|
||||
public class RenderTilePrism extends TileEntityRenderer<TilePrism> {
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(x, y, z);
|
||||
GlStateManager.translated(x, y, z);
|
||||
float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F;
|
||||
|
||||
ItemStack stack = prism.getItemHandler().getStackInSlot(0);
|
||||
|
||||
if(!stack.isEmpty()) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
if(stack.getItem() instanceof ILens) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(0.5F, 0.5F, pos);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(0.5F, 0.5F, pos);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -43,7 +43,7 @@ import vazkii.botania.common.block.BlockPylon;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TilePylon;
|
||||
|
||||
public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implements IMultiblockRenderHook {
|
||||
public class RenderTilePylon extends TileEntityRenderer<TilePylon> implements IMultiblockRenderHook {
|
||||
|
||||
private static final ResourceLocation MANA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_MANA);
|
||||
private static final ResourceLocation NATURA_TEXTURE = new ResourceLocation(LibResources.MODEL_PYLON_NATURA);
|
||||
@@ -57,33 +57,33 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
private static BlockPylon.Variant forceVariant = BlockPylon.Variant.MANA;
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
boolean renderingItem = pylon == ForwardingTEISR.DUMMY;
|
||||
|
||||
if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockType() instanceof BlockPylon)))
|
||||
if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockState().getBlock() instanceof BlockPylon)))
|
||||
return;
|
||||
|
||||
renderPylon(pylon, d0, d1, d2, pticks, renderingItem);
|
||||
}
|
||||
|
||||
private void renderPylon(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, boolean renderingItem) {
|
||||
BlockPylon.Variant type = renderingItem ? forceVariant : ((BlockPylon) pylon.getBlockType()).variant;
|
||||
BlockPylon.Variant type = renderingItem ? forceVariant : ((BlockPylon) pylon.getBlockState().getBlock()).variant;
|
||||
IPylonModel model;
|
||||
switch(type) {
|
||||
default:
|
||||
case MANA: {
|
||||
model = manaModel;
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(MANA_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(MANA_TEXTURE);
|
||||
break;
|
||||
}
|
||||
case NATURA: {
|
||||
model = naturaModel;
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(NATURA_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(NATURA_TEXTURE);
|
||||
break;
|
||||
}
|
||||
case GAIA: {
|
||||
model = gaiaModel;
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(GAIA_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(GAIA_TEXTURE);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -93,35 +93,35 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
float a = MultiblockRenderHandler.rendering ? 0.6F : 1F;
|
||||
GlStateManager.color(1F, 1F, 1F, a);
|
||||
GlStateManager.color4f(1F, 1F, 1F, a);
|
||||
|
||||
double worldTime = (double) (ClientTickHandler.ticksInGame + pticks);
|
||||
|
||||
worldTime += renderingItem ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360);
|
||||
|
||||
GlStateManager.translate(d0, d1 + (renderingItem ? 1.35 : 1.5), d2);
|
||||
GlStateManager.scale(1.0F, -1.0F, -1.0F);
|
||||
GlStateManager.translated(d0, d1 + (renderingItem ? 1.35 : 1.5), d2);
|
||||
GlStateManager.scalef(1.0F, -1.0F, -1.0F);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0.5F, 0F, -0.5F);
|
||||
GlStateManager.translatef(0.5F, 0F, -0.5F);
|
||||
if(!renderingItem)
|
||||
GlStateManager.rotate((float) worldTime * 1.5F, 0F, 1F, 0F);
|
||||
GlStateManager.rotatef((float) worldTime * 1.5F, 0F, 1F, 0F);
|
||||
|
||||
model.renderRing();
|
||||
if(!renderingItem)
|
||||
GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D);
|
||||
GlStateManager.translated(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
if(!renderingItem)
|
||||
GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 17.5, 0D);
|
||||
GlStateManager.translated(0D, Math.sin(worldTime / 20D) / 17.5, 0D);
|
||||
|
||||
GlStateManager.translate(0.5F, 0F, -0.5F);
|
||||
GlStateManager.translatef(0.5F, 0F, -0.5F);
|
||||
if(!renderingItem)
|
||||
GlStateManager.rotate((float) -worldTime, 0F, 1F, 0F);
|
||||
GlStateManager.rotatef((float) -worldTime, 0F, 1F, 0F);
|
||||
|
||||
GlStateManager.disableCull();
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.disableAlphaTest();
|
||||
|
||||
if(!renderingItem)
|
||||
ShaderHelper.useShader(ShaderHelper.pylonGlow);
|
||||
@@ -129,7 +129,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
if(!renderingItem)
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableCull();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -149,12 +149,12 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack, float partialTicks) {
|
||||
public void renderByItem(ItemStack stack) {
|
||||
if(Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) {
|
||||
RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant;
|
||||
TileEntityRendererDispatcher.instance.render(DUMMY, 0, 0, 0, partialTicks);
|
||||
TileEntityRendererDispatcher.instance.render(DUMMY, 0, 0, 0, 0);
|
||||
} else {
|
||||
compose.renderByItem(stack, partialTicks);
|
||||
compose.renderByItem(stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -162,7 +162,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> implem
|
||||
@Override
|
||||
public void renderBlockForMultiblock(IBlockReader world, Multiblock mb, IBlockState state, MultiblockComponent comp) {
|
||||
forceVariant = ((BlockPylon) state.getBlock()).variant;
|
||||
GlStateManager.translate(-0.5, -0.25, -0.5);
|
||||
GlStateManager.translatef(-0.5F, -0.25F, -0.5F);
|
||||
renderPylon((TilePylon) comp.getTileEntity(), 0, 0, 0, 0, true);
|
||||
forceVariant = BlockPylon.Variant.MANA;
|
||||
}
|
||||
|
||||
@@ -10,17 +10,14 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraftforge.client.model.animation.FastTESR;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import vazkii.botania.client.core.handler.RedStringRenderer;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileRedString extends FastTESR<TileRedString> {
|
||||
public class RenderTileRedString extends TileEntityRenderer<TileRedString> {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityFast(@Nonnull TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage, float unused, @Nonnull BufferBuilder worldRenderer) {
|
||||
public void render(TileRedString trs, double x, double y, double z, float partialTicks, int destroyStage) {
|
||||
RedStringRenderer.redStringTiles.add(trs);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
@@ -23,15 +23,15 @@ import vazkii.botania.common.block.tile.TileRuneAltar;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar> {
|
||||
public class RenderTileRuneAltar extends TileEntityRenderer<TileRuneAltar> {
|
||||
|
||||
final ModelSpinningCubes cubes = new ModelSpinningCubes();
|
||||
private final ModelSpinningCubes cubes = new ModelSpinningCubes();
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(x, y, z);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(x, y, z);
|
||||
|
||||
int items = 0;
|
||||
for(int i = 0; i < altar.getSizeInventory(); i++)
|
||||
@@ -47,39 +47,39 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
|
||||
|
||||
double time = ClientTickHandler.ticksInGame + partticks;
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
for(int i = 0; i < altar.getSizeInventory(); i++) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0.5F, 1.25F, 0.5F);
|
||||
GlStateManager.rotate(angles[i] + (float) time, 0F, 1F, 0F);
|
||||
GlStateManager.translate(1.125F, 0F, 0.25F);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0D, 0.075 * Math.sin((time + i * 10) / 5D), 0F);
|
||||
GlStateManager.translatef(0.5F, 1.25F, 0.5F);
|
||||
GlStateManager.rotatef(angles[i] + (float) time, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(1.125F, 0F, 0.25F);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translated(0D, 0.075 * Math.sin((time + i * 10) / 5D), 0F);
|
||||
ItemStack stack = altar.getItemHandler().getStackInSlot(i);
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if(!stack.isEmpty()) {
|
||||
mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
mc.getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0.5F, 1.8F, 0.5F);
|
||||
GlStateManager.rotate(180F, 1F, 0F, 1F);
|
||||
GlStateManager.translatef(0.5F, 1.8F, 0.5F);
|
||||
GlStateManager.rotatef(180F, 1F, 0F, 1F);
|
||||
int repeat = 15;
|
||||
cubes.renderSpinningCubes(2, repeat, repeat);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.translate(0F, 0.2F, 0F);
|
||||
GlStateManager.translatef(0F, 0.2F, 0F);
|
||||
float scale = altar.getTargetMana() == 0 ? 0 : (float) altar.getCurrentMana() / (float) altar.getTargetMana() / 75F;
|
||||
|
||||
if(scale != 0) {
|
||||
int seed = altar.getPos().getX() ^ altar.getPos().getY() ^ altar.getPos().getZ();
|
||||
GlStateManager.translate(0.5F, 0.7F, 0.5F);
|
||||
GlStateManager.translatef(0.5F, 0.7F, 0.5F);
|
||||
RenderHelper.renderStar(0x00E4D7, scale, scale, scale, seed);
|
||||
}
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -12,35 +12,35 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.common.block.tile.TileSparkChanger;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkChanger> {
|
||||
public class RenderTileSparkChanger extends TileEntityRenderer<TileSparkChanger> {
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(1.0F, -0.125F, -0.25F);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(1.0F, -0.125F, -0.25F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
ItemStack stack = tileentity.getItemHandler().getStackInSlot(0);
|
||||
if(!stack.isEmpty()) {
|
||||
GlStateManager.pushMatrix();
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
float s = 1.0F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.rotate(180F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0.5, 0.5, 0);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
GlStateManager.rotatef(180F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0.5F, 0.5F, 0);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -15,13 +15,14 @@ import java.util.Random;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockCarpet;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -33,7 +34,7 @@ import vazkii.botania.client.model.ModelSpreader;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.mana.TileSpreader;
|
||||
|
||||
public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader> {
|
||||
public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER);
|
||||
private static final ResourceLocation textureRs = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE);
|
||||
@@ -48,92 +49,114 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
|
||||
private static final ModelSpreader model = new ModelSpreader();
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.rotate(spreader.rotationX + 90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0F, -1F, 0F);
|
||||
GlStateManager.rotate(spreader.rotationY, 1F, 0F, 0F);
|
||||
GlStateManager.translate(0F, 1F, 0F);
|
||||
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.rotatef(spreader.rotationX + 90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0F, -1F, 0F);
|
||||
GlStateManager.rotatef(spreader.rotationY, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(0F, 1F, 0F);
|
||||
|
||||
ResourceLocation r = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : spreader.isULTRA_SPREADER() ? textureG : texture;
|
||||
if(ClientProxy.dootDoot)
|
||||
r = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : spreader.isULTRA_SPREADER() ? textureGHalloween : textureHalloween;
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(r);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
Minecraft.getInstance().textureManager.bindTexture(r);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
|
||||
double time = ClientTickHandler.ticksInGame + ticks;
|
||||
|
||||
if(spreader.isULTRA_SPREADER()) {
|
||||
Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.getPos().hashCode()).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F);
|
||||
GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
|
||||
GlStateManager.color3f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
|
||||
}
|
||||
model.render();
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
double worldTicks = spreader.getWorld() == null ? 0 : time;
|
||||
GlStateManager.rotate((float) worldTicks % 360, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F);
|
||||
GlStateManager.rotatef((float) worldTicks % 360, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F);
|
||||
model.renderCube();
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
ItemStack stack = spreader.getItemHandler().getStackInSlot(0);
|
||||
|
||||
if(!stack.isEmpty()) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
stack.getItem();
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0.0F, -1F, -0.4675F);
|
||||
GlStateManager.rotate(180, 0, 0, 1);
|
||||
GlStateManager.rotate(180, 1, 0, 0);
|
||||
GlStateManager.scale(1.0F, 1.0F, 1.0F);
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
|
||||
GlStateManager.translatef(0.0F, -1F, -0.4675F);
|
||||
GlStateManager.rotatef(180, 0, 0, 1);
|
||||
GlStateManager.rotatef(180, 1, 0, 0);
|
||||
GlStateManager.scalef(1.0F, 1.0F, 1.0F);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
if(spreader.paddingColor != -1) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
IBlockState carpet = Blocks.CARPET.getDefaultState().with(BlockCarpet.COLOR, EnumDyeColor.byMetadata(spreader.paddingColor));
|
||||
IBlockState carpet = carpetFor(spreader.paddingColor).getDefaultState();
|
||||
|
||||
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
|
||||
GlStateManager.translatef(-0.5F, -0.5F, 0.5F);
|
||||
float f = 1 / 16F;
|
||||
|
||||
GlStateManager.translate(0, -f - 0.001, 0);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translate(0, f + 0.001, 0);
|
||||
GlStateManager.rotate(-90, 0, 1, 0);
|
||||
GlStateManager.translatef(0, -f - 0.001F, 0);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translatef(0, f + 0.001F, 0);
|
||||
GlStateManager.rotatef(-90, 0, 1, 0);
|
||||
|
||||
GlStateManager.translate(-0.001, 0, 0);
|
||||
GlStateManager.rotate(270, 0, 0, 1);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translate(0, 0.001, 0);
|
||||
GlStateManager.rotate(-90, 0, 1, 0);
|
||||
GlStateManager.translatef(-0.001F, 0, 0);
|
||||
GlStateManager.rotatef(270, 0, 0, 1);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translatef(0, 0.001F, 0);
|
||||
GlStateManager.rotatef(-90, 0, 1, 0);
|
||||
|
||||
GlStateManager.translate(0, 15 * f + 0.001, -0.001);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translate(0, -0.001, 0.001);
|
||||
GlStateManager.rotate(-90, 0, 1, 0);
|
||||
GlStateManager.translatef(0, 15 * f + 0.001F, -0.001F);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translatef(0, -0.001F, 0.001F);
|
||||
GlStateManager.rotatef(-90, 0, 1, 0);
|
||||
|
||||
GlStateManager.translate(15 * f + 0.001, f, 0.001);
|
||||
GlStateManager.rotate(270, 0, 0, 1);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translate(-0.001, 0, -0.001);
|
||||
GlStateManager.rotate(-90, 0, 1, 0);
|
||||
GlStateManager.translatef(15 * f + 0.001F, f, 0.001F);
|
||||
GlStateManager.rotatef(270, 0, 0, 1);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translatef(-0.001F, 0, -0.001F);
|
||||
GlStateManager.rotatef(-90, 0, 1, 0);
|
||||
|
||||
GlStateManager.translate(-0.001, -1 + f + 0.001, -f + 0.001);
|
||||
GlStateManager.rotate(90, 1, 0, 0);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
GlStateManager.translatef(-0.001F, -1 + f + 0.001F, -f + 0.001F);
|
||||
GlStateManager.rotatef(90, 1, 0, 0);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
|
||||
}
|
||||
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
private static Block carpetFor(int color) {
|
||||
switch (EnumDyeColor.byId(color)) {
|
||||
default:
|
||||
case WHITE: return Blocks.WHITE_CARPET;
|
||||
case ORANGE: return Blocks.ORANGE_CARPET;
|
||||
case MAGENTA: return Blocks.ORANGE_CARPET;
|
||||
case LIGHT_BLUE: return Blocks.ORANGE_CARPET;
|
||||
case YELLOW: return Blocks.ORANGE_CARPET;
|
||||
case LIME: return Blocks.ORANGE_CARPET;
|
||||
case PINK: return Blocks.ORANGE_CARPET;
|
||||
case GRAY: return Blocks.ORANGE_CARPET;
|
||||
case LIGHT_GRAY: return Blocks.ORANGE_CARPET;
|
||||
case CYAN: return Blocks.ORANGE_CARPET;
|
||||
case PURPLE: return Blocks.ORANGE_CARPET;
|
||||
case BLUE: return Blocks.ORANGE_CARPET;
|
||||
case BROWN: return Blocks.ORANGE_CARPET;
|
||||
case GREEN: return Blocks.ORANGE_CARPET;
|
||||
case RED: return Blocks.ORANGE_CARPET;
|
||||
case BLACK: return Blocks.ORANGE_CARPET;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -15,9 +15,12 @@ import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.GLAllocation;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.tileentity.TileEntityEndPortal;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.Util;
|
||||
import vazkii.botania.common.block.tile.TileStarfield;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -26,136 +29,88 @@ import java.nio.FloatBuffer;
|
||||
import java.util.Random;
|
||||
|
||||
// This is copied from the vanilla end portal TESR, relevant edits are commented
|
||||
public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield> {
|
||||
|
||||
public class RenderTileStarfield extends TileEntityRenderer<TileStarfield> {
|
||||
private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png");
|
||||
private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png");
|
||||
private static final Random RANDOM = new Random(31100L);
|
||||
private static final FloatBuffer MODELVIEW = GLAllocation.createDirectFloatBuffer(16);
|
||||
private static final FloatBuffer PROJECTION = GLAllocation.createDirectFloatBuffer(16);
|
||||
private FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16);
|
||||
private final FloatBuffer buffer = GLAllocation.createDirectFloatBuffer(16);
|
||||
|
||||
@Override
|
||||
public void render(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage, float unused)
|
||||
{
|
||||
public void render(TileStarfield tileEntityIn, double x, double y, double z, float partialTicks, int destroyStage) {
|
||||
GlStateManager.disableLighting();
|
||||
RANDOM.setSeed(31100L);
|
||||
GlStateManager.getFloat(2982, MODELVIEW);
|
||||
GlStateManager.getFloat(2983, PROJECTION);
|
||||
GlStateManager.getFloatv(2982, MODELVIEW);
|
||||
GlStateManager.getFloatv(2983, PROJECTION);
|
||||
double d0 = x * x + y * y + z * z;
|
||||
int i = this.getPasses(d0);
|
||||
float f = this.getOffset();
|
||||
boolean flag = false;
|
||||
|
||||
for (int j = 0; j < i; ++j)
|
||||
{
|
||||
for(int j = 0; j < i; ++j) {
|
||||
GlStateManager.pushMatrix();
|
||||
float f1 = 2.0F / (float)(18 - j);
|
||||
|
||||
if (j == 0)
|
||||
{
|
||||
if (j == 0) {
|
||||
this.bindTexture(END_SKY_TEXTURE);
|
||||
f1 = 0.15F;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
|
||||
}
|
||||
|
||||
if (j >= 1)
|
||||
{
|
||||
if (j >= 1) {
|
||||
this.bindTexture(END_PORTAL_TEXTURE);
|
||||
flag = true;
|
||||
Minecraft.getMinecraft().entityRenderer.setupFogColor(true);
|
||||
Minecraft.getInstance().gameRenderer.setupFogColor(true);
|
||||
}
|
||||
|
||||
if (j == 1)
|
||||
{
|
||||
if (j == 1) {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE);
|
||||
}
|
||||
|
||||
GlStateManager.texGen(GlStateManager.TexGen.S, 9216);
|
||||
GlStateManager.texGen(GlStateManager.TexGen.T, 9216);
|
||||
GlStateManager.texGen(GlStateManager.TexGen.R, 9216);
|
||||
GlStateManager.texGen(GlStateManager.TexGen.S, 9474, this.getBuffer(1.0F, 0.0F, 0.0F, 0.0F));
|
||||
GlStateManager.texGen(GlStateManager.TexGen.T, 9474, this.getBuffer(0.0F, 1.0F, 0.0F, 0.0F));
|
||||
GlStateManager.texGen(GlStateManager.TexGen.R, 9474, this.getBuffer(0.0F, 0.0F, 1.0F, 0.0F));
|
||||
GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S);
|
||||
GlStateManager.enableTexGenCoord(GlStateManager.TexGen.T);
|
||||
GlStateManager.enableTexGenCoord(GlStateManager.TexGen.R);
|
||||
GlStateManager.texGenMode(GlStateManager.TexGen.S, 9216);
|
||||
GlStateManager.texGenMode(GlStateManager.TexGen.T, 9216);
|
||||
GlStateManager.texGenMode(GlStateManager.TexGen.R, 9216);
|
||||
GlStateManager.texGenParam(GlStateManager.TexGen.S, 9474, this.getBuffer(1.0F, 0.0F, 0.0F, 0.0F));
|
||||
GlStateManager.texGenParam(GlStateManager.TexGen.T, 9474, this.getBuffer(0.0F, 1.0F, 0.0F, 0.0F));
|
||||
GlStateManager.texGenParam(GlStateManager.TexGen.R, 9474, this.getBuffer(0.0F, 0.0F, 1.0F, 0.0F));
|
||||
GlStateManager.enableTexGen(GlStateManager.TexGen.S);
|
||||
GlStateManager.enableTexGen(GlStateManager.TexGen.T);
|
||||
GlStateManager.enableTexGen(GlStateManager.TexGen.R);
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.matrixMode(5890);
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.loadIdentity();
|
||||
GlStateManager.translate(0.5F, 0.5F, 0.0F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 1.0F);
|
||||
GlStateManager.translatef(0.5F, 0.5F, 0.0F);
|
||||
GlStateManager.scalef(0.5F, 0.5F, 1.0F);
|
||||
float f2 = (float)(j + 1);
|
||||
GlStateManager.translate(17.0F / f2, (2.0F + f2 / 1.5F) * ((float)Minecraft.getSystemTime() % 800000.0F / 800000.0F), 0.0F);
|
||||
GlStateManager.rotate((f2 * f2 * 4321.0F + f2 * 9.0F) * 2.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.scale(4.5F - f2 / 4.0F, 4.5F - f2 / 4.0F, 1.0F);
|
||||
GlStateManager.multMatrix(PROJECTION);
|
||||
GlStateManager.multMatrix(MODELVIEW);
|
||||
GlStateManager.translatef(17.0F / f2, (2.0F + f2 / 1.5F) * ((float) Util.milliTime() % 800000.0F / 800000.0F), 0.0F);
|
||||
GlStateManager.rotatef((f2 * f2 * 4321.0F + f2 * 9.0F) * 2.0F, 0.0F, 0.0F, 1.0F);
|
||||
GlStateManager.scalef(4.5F - f2 / 4.0F, 4.5F - f2 / 4.0F, 1.0F);
|
||||
GlStateManager.multMatrixf(PROJECTION);
|
||||
GlStateManager.multMatrixf(MODELVIEW);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
BufferBuilder BufferBuilder = tessellator.getBuffer();
|
||||
BufferBuilder.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
BufferBuilder bufferbuilder = tessellator.getBuffer();
|
||||
bufferbuilder.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
float f3 = (RANDOM.nextFloat() * 0.5F + 0.1F) * f1;
|
||||
float f4 = (RANDOM.nextFloat() * 0.5F + 0.4F) * f1;
|
||||
float f5 = (RANDOM.nextFloat() * 0.5F + 0.5F) * f1;
|
||||
|
||||
// Botania: change color based on time
|
||||
Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F);
|
||||
Color color = Color.getHSBColor(Util.milliTime() / 20F % 360 / 360F, 1F, 1F);
|
||||
f3 = color.getRed() / 255F;
|
||||
f4 = color.getGreen() / 255F;
|
||||
f5 = color.getBlue() / 255F;
|
||||
|
||||
f3 *= f1; f4 *= f1; f5 *= f1;
|
||||
|
||||
/* Botania - don't render other faces
|
||||
if (te.shouldRenderFace(EnumFacing.SOUTH))
|
||||
// Botania: render up face only
|
||||
{
|
||||
BufferBuilder.pos(x, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
}
|
||||
|
||||
if (te.shouldRenderFace(EnumFacing.NORTH))
|
||||
{
|
||||
BufferBuilder.pos(x, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
}
|
||||
|
||||
if (te.shouldRenderFace(EnumFacing.EAST))
|
||||
{
|
||||
BufferBuilder.pos(x + 1.0D, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
}
|
||||
|
||||
if (te.shouldRenderFace(EnumFacing.WEST))
|
||||
{
|
||||
BufferBuilder.pos(x, y, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
}
|
||||
|
||||
if (te.shouldRenderFace(EnumFacing.DOWN))
|
||||
{
|
||||
BufferBuilder.pos(x, y, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
}*/
|
||||
|
||||
// Botania - always render up face if (te.shouldRenderFace(EnumFacing.UP))
|
||||
{
|
||||
BufferBuilder.pos(x, y + (double)f, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y + (double)f, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x + 1.0D, y + (double)f, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
BufferBuilder.pos(x, y + (double)f, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
bufferbuilder.pos(x, y + (double)f, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
bufferbuilder.pos(x + 1.0D, y + (double)f, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex();
|
||||
bufferbuilder.pos(x + 1.0D, y + (double)f, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
bufferbuilder.pos(x, y + (double)f, z).color(f3, f4, f5, 1.0F).endVertex();
|
||||
}
|
||||
|
||||
tessellator.draw();
|
||||
@@ -165,68 +120,46 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
|
||||
}
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableTexGenCoord(GlStateManager.TexGen.S);
|
||||
GlStateManager.disableTexGenCoord(GlStateManager.TexGen.T);
|
||||
GlStateManager.disableTexGenCoord(GlStateManager.TexGen.R);
|
||||
GlStateManager.disableTexGen(GlStateManager.TexGen.S);
|
||||
GlStateManager.disableTexGen(GlStateManager.TexGen.T);
|
||||
GlStateManager.disableTexGen(GlStateManager.TexGen.R);
|
||||
GlStateManager.enableLighting();
|
||||
|
||||
if (flag)
|
||||
{
|
||||
Minecraft.getMinecraft().entityRenderer.setupFogColor(false);
|
||||
if (flag) {
|
||||
Minecraft.getInstance().gameRenderer.setupFogColor(false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private int getPasses(double p_191286_1_)
|
||||
{
|
||||
private int getPasses(double p_191286_1_) {
|
||||
int i;
|
||||
|
||||
if (p_191286_1_ > 36864.0D)
|
||||
{
|
||||
if (p_191286_1_ > 36864.0D) {
|
||||
i = 1;
|
||||
}
|
||||
else if (p_191286_1_ > 25600.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 25600.0D) {
|
||||
i = 3;
|
||||
}
|
||||
else if (p_191286_1_ > 16384.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 16384.0D) {
|
||||
i = 5;
|
||||
}
|
||||
else if (p_191286_1_ > 9216.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 9216.0D) {
|
||||
i = 7;
|
||||
}
|
||||
else if (p_191286_1_ > 4096.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 4096.0D) {
|
||||
i = 9;
|
||||
}
|
||||
else if (p_191286_1_ > 1024.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 1024.0D) {
|
||||
i = 11;
|
||||
}
|
||||
else if (p_191286_1_ > 576.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 576.0D) {
|
||||
i = 13;
|
||||
}
|
||||
else if (p_191286_1_ > 256.0D)
|
||||
{
|
||||
} else if (p_191286_1_ > 256.0D) {
|
||||
i = 14;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
i = 15;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
private float getOffset()
|
||||
{
|
||||
private float getOffset() {
|
||||
return 0.24F; // Botania: move to bottom of block space
|
||||
}
|
||||
|
||||
private FloatBuffer getBuffer(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_)
|
||||
{
|
||||
private FloatBuffer getBuffer(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) {
|
||||
this.buffer.clear();
|
||||
this.buffer.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_);
|
||||
this.buffer.flip();
|
||||
|
||||
@@ -16,7 +16,7 @@ import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
@@ -26,42 +26,42 @@ import vazkii.botania.common.block.tile.TileTerraPlate;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class RenderTileTerraPlate extends TileEntitySpecialRenderer<TileTerraPlate> {
|
||||
public class RenderTileTerraPlate extends TileEntityRenderer<TileTerraPlate> {
|
||||
|
||||
@Override
|
||||
public void render(@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 max = TileTerraPlate.MAX_MANA / 10F;
|
||||
float alphaMod = Math.min(max, plate.getCurrentMana()) / max;
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
|
||||
GlStateManager.rotate(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(0F, 0F, -3F / 16F - 0.001F);
|
||||
GlStateManager.rotatef(90F, 1F, 0F, 0F);
|
||||
GlStateManager.translatef(0F, 0F, -3F / 16F - 0.001F);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlpha();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.disableAlphaTest();
|
||||
float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.6D) * alphaMod;
|
||||
if(ShaderHelper.useShaders())
|
||||
GlStateManager.color(1F, 1F, 1F, alpha);
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
else {
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
GlStateManager.color(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
GlStateManager.color4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
|
||||
}
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
ShaderHelper.useShader(ShaderHelper.terraPlateRune);
|
||||
renderIcon(0, 0, MiscellaneousIcons.INSTANCE.terraPlateOverlay, 1, 1, 240);
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.tile;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
@@ -24,38 +24,38 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.Random;
|
||||
|
||||
public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer<TileTeruTeruBozu> {
|
||||
public class RenderTileTeruTeruBozu extends TileEntityRenderer<TileTeruTeruBozu> {
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU);
|
||||
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU_HALLOWEEN);
|
||||
final ModelTeruTeruBozu model = new ModelTeruTeruBozu();
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.disableCull();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(d0, d1, d2);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
|
||||
GlStateManager.rotate(180F, 1F, 0F, 0F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(d0, d1, d2);
|
||||
Minecraft.getInstance().textureManager.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
|
||||
GlStateManager.rotatef(180F, 1F, 0F, 0F);
|
||||
double time = Botania.proxy.getWorldElapsedTicks() + f;
|
||||
boolean hasWorld = tileentity != null && tileentity.getWorld() != null;
|
||||
if(hasWorld)
|
||||
time += new Random(tileentity.getPos().hashCode()).nextInt(1000);
|
||||
|
||||
GlStateManager.translate(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F);
|
||||
GlStateManager.translatef(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F);
|
||||
if(hasWorld) {
|
||||
GlStateManager.rotate((float) (time * 0.3), 0F, 1F, 0F);
|
||||
GlStateManager.rotate(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F);
|
||||
GlStateManager.rotatef((float) (time * 0.3), 0F, 1F, 0F);
|
||||
GlStateManager.rotatef(4F * (float) Math.sin(time * 0.05F), 0F, 0F, 1F);
|
||||
float s = 0.75F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
}
|
||||
|
||||
model.render();
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableCull();
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
@@ -16,10 +16,10 @@ import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
@@ -28,6 +28,7 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumFacing.Axis;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import vazkii.botania.api.item.TinyPotatoRenderEvent;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -48,7 +49,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPotato> {
|
||||
public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO);
|
||||
private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS);
|
||||
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TINY_POTATO_HALLOWEEN);
|
||||
@@ -64,19 +65,19 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(@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) {
|
||||
if(!potato.getWorld().isBlockLoaded(potato.getPos(), false)
|
||||
|| potato.getWorld().getBlockState(potato.getPos()).getBlock() != ModBlocks.tinyPotato)
|
||||
return;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translate(x, y, z);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.translated(x, y, z);
|
||||
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
mc.renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
|
||||
String name = potato.name.toLowerCase().trim();
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
mc.textureManager.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
|
||||
String name = potato.name.getString().toLowerCase().trim();
|
||||
|
||||
boolean usedShader = false;
|
||||
if (matches(name, "gaia")) {
|
||||
@@ -101,11 +102,11 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
usedShader = true;
|
||||
}
|
||||
|
||||
GlStateManager.translate(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
int meta = potato.getWorld() == null ? 3 : potato.getBlockMetadata();
|
||||
float rotY = meta * 90F - 180F;
|
||||
GlStateManager.rotate(rotY, 0F, 1F, 0F);
|
||||
GlStateManager.rotatef(rotY, 0F, 1F, 0F);
|
||||
|
||||
float jump = potato.jumpTicks;
|
||||
if (jump > 0)
|
||||
@@ -114,25 +115,25 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
float up = (float) -Math.abs(Math.sin(jump / 10 * Math.PI)) * 0.2F;
|
||||
float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2;
|
||||
|
||||
GlStateManager.translate(0F, up, 0F);
|
||||
GlStateManager.rotate(rotZ, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(0F, up, 0F);
|
||||
GlStateManager.rotatef(rotZ, 0F, 0F, 1F);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
switch (name) {
|
||||
case "pahimar":
|
||||
GlStateManager.scale(1F, 0.3F, 1F);
|
||||
GlStateManager.translate(0F, 3.5F, 0F);
|
||||
GlStateManager.scalef(1F, 0.3F, 1F);
|
||||
GlStateManager.translatef(0F, 3.5F, 0F);
|
||||
break;
|
||||
case "kyle hyde":
|
||||
mc.renderEngine.bindTexture(textureGrayscale);
|
||||
mc.textureManager.bindTexture(textureGrayscale);
|
||||
break;
|
||||
case "dinnerbone":
|
||||
case "grumm":
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translate(0F, -2.625F, 0F);
|
||||
GlStateManager.rotatef(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(0F, -2.625F, 0F);
|
||||
break;
|
||||
case "aureylian":
|
||||
GlStateManager.color(1F, 0.5F, 1F);
|
||||
GlStateManager.color3f(1F, 0.5F, 1F);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -140,7 +141,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
if (render)
|
||||
model.render();
|
||||
if (name.equals("kingdaddydmac")) {
|
||||
GlStateManager.translate(0.5F, 0F, 0F);
|
||||
GlStateManager.translatef(0.5F, 0F, 0F);
|
||||
model.render();
|
||||
}
|
||||
|
||||
@@ -150,15 +151,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.rotate(180F, 0, 0, 1);
|
||||
GlStateManager.translate(0F, -1F, 0F);
|
||||
GlStateManager.rotatef(180F, 0, 0, 1);
|
||||
GlStateManager.translatef(0F, -1F, 0F);
|
||||
float s = 1F / 3.5F;
|
||||
GlStateManager.scale(s, s, s);
|
||||
GlStateManager.scalef(s, s, s);
|
||||
|
||||
EnumFacing potatoFacing = potato.getWorld().getBlockState(potato.getPos()).getValue(BotaniaStateProps.CARDINALS);
|
||||
EnumFacing potatoFacing = potato.getWorld().getBlockState(potato.getPos()).get(BotaniaStateProps.CARDINALS);
|
||||
|
||||
for(int i = 0; i < potato.getSizeInventory(); i++) {
|
||||
ItemStack stack = potato.getItemHandler().getStackInSlot(i);
|
||||
@@ -178,56 +179,56 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
switch(side) {
|
||||
case UP:
|
||||
if(mySon)
|
||||
GlStateManager.translate(0F, 0.6F, 0.5F);
|
||||
GlStateManager.translatef(0F, 0.6F, 0.5F);
|
||||
else if(block)
|
||||
GlStateManager.translate(0F, 0.3F, 0.5F);
|
||||
GlStateManager.translate(0F, -0.5F, -0.4F);
|
||||
GlStateManager.translatef(0F, 0.3F, 0.5F);
|
||||
GlStateManager.translatef(0F, -0.5F, -0.4F);
|
||||
break;
|
||||
case DOWN:
|
||||
GlStateManager.translate(0, -2.3, -0.88);
|
||||
GlStateManager.translatef(0, -2.3F, -0.88F);
|
||||
if(mySon)
|
||||
GlStateManager.translate(0, .65, 0.6);
|
||||
GlStateManager.translatef(0, .65F, 0.6F);
|
||||
else if(block)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
GlStateManager.translatef(0, 1, 0.6F);
|
||||
break;
|
||||
case NORTH:
|
||||
GlStateManager.translate(0, -1.9, 0.02);
|
||||
GlStateManager.translatef(0, -1.9F, 0.02F);
|
||||
if(mySon)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
GlStateManager.translatef(0, 1, 0.6F);
|
||||
else if(block)
|
||||
GlStateManager.translate(0, 1, 0.6);
|
||||
GlStateManager.translatef(0, 1, 0.6F);
|
||||
break;
|
||||
case SOUTH:
|
||||
GlStateManager.translate(0, -1.6, -0.89);
|
||||
GlStateManager.translatef(0, -1.6F, -0.89F);
|
||||
if(mySon)
|
||||
GlStateManager.translate(0, 1.4, 0.5);
|
||||
GlStateManager.translatef(0, 1.4F, 0.5F);
|
||||
else if(block)
|
||||
GlStateManager.translate(0, 1.0, 0.5);
|
||||
GlStateManager.translatef(0, 1.0F, 0.5F);
|
||||
break;
|
||||
case EAST:
|
||||
if(mySon)
|
||||
GlStateManager.translate(-0.4F, 0.65F, 0F);
|
||||
GlStateManager.translatef(-0.4F, 0.65F, 0F);
|
||||
else if(block)
|
||||
GlStateManager.translate(-0.4F, 0.8F, 0F);
|
||||
else GlStateManager.rotate(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(-0.3F, -1.9F, 0.04F);
|
||||
GlStateManager.translatef(-0.4F, 0.8F, 0F);
|
||||
else GlStateManager.rotatef(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(-0.3F, -1.9F, 0.04F);
|
||||
break;
|
||||
case WEST:
|
||||
if(mySon)
|
||||
GlStateManager.translate(1F, 0.65F, 1F);
|
||||
GlStateManager.translatef(1F, 0.65F, 1F);
|
||||
else if(block)
|
||||
GlStateManager.translate(1F, 0.8F, 1F);
|
||||
else GlStateManager.rotate(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(-0.3F, -1.9F, -0.92F);
|
||||
GlStateManager.translatef(1F, 0.8F, 1F);
|
||||
else GlStateManager.rotatef(-90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(-0.3F, -1.9F, -0.92F);
|
||||
break;
|
||||
}
|
||||
|
||||
if (mySon)
|
||||
GlStateManager.scale(1.1, 1.1, 1.1);
|
||||
GlStateManager.scalef(1.1F, 1.1F, 1.1F);
|
||||
else if(block)
|
||||
GlStateManager.scale(0.5, 0.5, 0.5);
|
||||
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
|
||||
if(block && side != EnumFacing.NORTH)
|
||||
GlStateManager.rotate(180F, 0, 1, 0);
|
||||
GlStateManager.rotatef(180F, 0, 1, 0);
|
||||
renderItem(stack);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
@@ -237,60 +238,61 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
ContributorFancinessHandler.firstStart();
|
||||
|
||||
float scale = 1F / 4F;
|
||||
GlStateManager.translate(0F, 1F, 0F);
|
||||
GlStateManager.scale(scale, scale, scale);
|
||||
GlStateManager.translatef(0F, 1F, 0F);
|
||||
GlStateManager.scalef(scale, scale, scale);
|
||||
if (name.equals("phi") || name.equals("vazkii")) {
|
||||
GlStateManager.translate(0.45F, 0F, 0.4F);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.rotate(20F, 1F, 0F, 1F);
|
||||
GlStateManager.translatef(0.45F, 0F, 0.4F);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
GlStateManager.rotatef(20F, 1F, 0F, 1F);
|
||||
renderIcon(MiscellaneousIcons.INSTANCE.phiFlowerIcon);
|
||||
|
||||
if (name.equals("vazkii")) {
|
||||
GlStateManager.rotate(-20F, 1F, 0F, 1F);
|
||||
GlStateManager.scale(1.25F, 1.25F, 1.25F);
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translate(-1.5F, -1.3F, -0.75F);
|
||||
GlStateManager.rotatef(-20F, 1F, 0F, 1F);
|
||||
GlStateManager.scalef(1.25F, 1.25F, 1.25F);
|
||||
GlStateManager.rotatef(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(-1.5F, -1.3F, -0.75F);
|
||||
renderIcon(MiscellaneousIcons.INSTANCE.nerfBatIcon);
|
||||
}
|
||||
} else if (name.equals("haighyorkie")) {
|
||||
GlStateManager.scale(1.25F, 1.25F, 1.25F);
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
|
||||
GlStateManager.scalef(1.25F, 1.25F, 1.25F);
|
||||
GlStateManager.rotatef(180F, 0F, 0F, 1F);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(-0.5F, -1.2F, -0.4F);
|
||||
renderIcon(MiscellaneousIcons.INSTANCE.goldfishIcon);
|
||||
} else if (name.equals("martysgames") || name.equals("marty")) {
|
||||
GlStateManager.scale(0.7F, 0.7F, 0.7F);
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translate(-0.3F, -2.7F, -1.2F);
|
||||
GlStateManager.rotate(15F, 0F, 0F, 1F);
|
||||
renderItem(new ItemStack(ModItems.infiniteFruit, 1).setStackDisplayName("das boot"));
|
||||
GlStateManager.scalef(0.7F, 0.7F, 0.7F);
|
||||
GlStateManager.rotatef(180F, 0F, 0F, 1F);
|
||||
GlStateManager.translatef(-0.3F, -2.7F, -1.2F);
|
||||
GlStateManager.rotatef(15F, 0F, 0F, 1F);
|
||||
renderItem(new ItemStack(ModItems.infiniteFruit, 1).setDisplayName(new TextComponentString("das boot")));
|
||||
} else if (name.equals("jibril")) {
|
||||
GlStateManager.scale(1.5F, 1.5F, 1.5F);
|
||||
GlStateManager.translate(0F, -0.8F, 0F);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.scalef(1.5F, 1.5F, 1.5F);
|
||||
GlStateManager.translatef(0F, -0.8F, 0F);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
ItemFlightTiara.renderHalo(null, partialTicks);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableLighting();
|
||||
} else if (name.equals("kingdaddydmac")) {
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
GlStateManager.rotate(180F, 0F, 0F, 1F);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0F, -3F, 0.65F);
|
||||
renderItem(new ItemStack(ModItems.manaRing, 1, 0));
|
||||
GlStateManager.translate(0F, 0F, -4F);
|
||||
renderItem(new ItemStack(ModItems.manaRing, 1, 0));
|
||||
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
|
||||
GlStateManager.rotatef(180F, 0F, 0F, 1F);
|
||||
GlStateManager.rotatef(90F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0F, -3F, 0.65F);
|
||||
ItemStack ring = new ItemStack(ModItems.manaRing);
|
||||
renderItem(ring);
|
||||
GlStateManager.translatef(0F, 0F, -4F);
|
||||
renderItem(ring);
|
||||
|
||||
GlStateManager.scale(0.8F, 0.8F, 0.8F);
|
||||
GlStateManager.translate(1.25F, -1.25F, 2.25F);
|
||||
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.scalef(0.8F, 0.8F, 0.8F);
|
||||
GlStateManager.translatef(1.25F, -1.25F, 2.25F);
|
||||
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
renderBlock(Blocks.CAKE);
|
||||
} else if (ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) {
|
||||
} else if (ContributorFancinessHandler.flowerMap.containsKey(name)) {
|
||||
ItemStack icon = ContributorFancinessHandler.flowerMap.getOrDefault(name, ItemStack.EMPTY);
|
||||
if (!icon.isEmpty()) {
|
||||
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.rotate(180F, 1F, 0F, 0F);
|
||||
GlStateManager.rotate(180F, 0F, 1F, 0F);
|
||||
GlStateManager.translate(0F, 0F, 0F);
|
||||
mc.textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.rotatef(180F, 1F, 0F, 0F);
|
||||
GlStateManager.rotatef(180F, 0F, 1F, 0F);
|
||||
GlStateManager.translatef(0F, 0F, 0F);
|
||||
ShaderHelper.useShader(ShaderHelper.gold);
|
||||
renderItem(icon);
|
||||
ShaderHelper.releaseShader();
|
||||
@@ -301,30 +303,30 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
|
||||
MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, x, y, z, partialTicks, destroyStage));
|
||||
|
||||
GlStateManager.rotate(-rotZ, 0F, 0F, 1F);
|
||||
GlStateManager.rotate(-rotY, 0F, 1F, 0F);
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.scale(1F, -1F, -1F);
|
||||
GlStateManager.rotatef(-rotZ, 0F, 0F, 1F);
|
||||
GlStateManager.rotatef(-rotY, 0F, 1F, 0F);
|
||||
GlStateManager.color3f(1F, 1F, 1F);
|
||||
GlStateManager.scalef(1F, -1F, -1F);
|
||||
|
||||
RayTraceResult pos = mc.objectMouseOver;
|
||||
if (!name.isEmpty() && pos != null && pos.getBlockPos() != null && potato.getPos().equals(pos.getBlockPos())) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translate(0F, -0.6F, 0F);
|
||||
GlStateManager.rotate(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F);
|
||||
GlStateManager.rotate(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F);
|
||||
GlStateManager.translatef(0F, -0.6F, 0F);
|
||||
GlStateManager.rotatef(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F);
|
||||
GlStateManager.rotatef(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F);
|
||||
float f = 1.6F;
|
||||
float f1 = 0.016666668F * f;
|
||||
GlStateManager.scale(-f1, -f1, f1);
|
||||
GlStateManager.scalef(-f1, -f1, f1);
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.translate(0.0F, 0F / f1, 0.0F);
|
||||
GlStateManager.translatef(0.0F, 0F / f1, 0.0F);
|
||||
GlStateManager.depthMask(false);
|
||||
GlStateManager.enableBlend();
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
OpenGlHelper.glBlendFuncSeparate(770, 771, 1, 0);
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
BufferBuilder worldrenderer = tessellator.getBuffer();
|
||||
GlStateManager.disableTexture2D();
|
||||
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
int i = mc.fontRenderer.getStringWidth(potato.name) / 2;
|
||||
int i = mc.fontRenderer.getStringWidth(potato.name.getString()) / 2;
|
||||
worldrenderer.pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
@@ -332,13 +334,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
tessellator.draw();
|
||||
GlStateManager.enableTexture2D();
|
||||
GlStateManager.depthMask(true);
|
||||
mc.fontRenderer.drawString(potato.name, -mc.fontRenderer.getStringWidth(potato.name) / 2, 0, 0xFFFFFF);
|
||||
mc.fontRenderer.drawString(potato.name.getFormattedText(), -i, 0, 0xFFFFFF);
|
||||
if (name.equals("pahimar") || name.equals("soaryn")) {
|
||||
GlStateManager.translate(0F, 14F, 0F);
|
||||
GlStateManager.translatef(0F, 14F, 0F);
|
||||
String str = name.equals("pahimar") ? "[WIP]" : "(soon)";
|
||||
GlStateManager.depthMask(false);
|
||||
GlStateManager.enableBlend();
|
||||
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||
OpenGlHelper.glBlendFuncSeparate(770, 771, 1, 0);
|
||||
GlStateManager.disableTexture2D();
|
||||
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
i = mc.fontRenderer.getStringWidth(str) / 2;
|
||||
@@ -354,8 +356,8 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
GlStateManager.scale(1F / -f1, 1F / -f1, 1F / f1);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.scalef(1F / -f1, 1F / -f1, 1F / f1);
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
@@ -367,15 +369,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 16F);
|
||||
}
|
||||
|
||||
private void renderItem(ItemStack stack) {
|
||||
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.HEAD);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.HEAD);
|
||||
}
|
||||
|
||||
private void renderBlock(Block block) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(block.getDefaultState(), 1.0F);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(block.getDefaultState(), 1.0F);
|
||||
}
|
||||
}
|
||||
@@ -25,8 +25,8 @@ public final class SkyblockRenderEvents {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onRender(RenderWorldLastEvent event) {
|
||||
World world = Minecraft.getMinecraft().world;
|
||||
if(ConfigHandler.enableFancySkybox && world.provider.getDimension() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().world))) {
|
||||
World world = Minecraft.getInstance().world;
|
||||
if(ConfigHandler.enableFancySkybox && world.provider.getDimension() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getInstance().world))) {
|
||||
if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer))
|
||||
world.provider.setSkyRenderer(new SkyblockSkyRenderer());
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ public class SkyblockSkyRenderer extends IRenderHandler {
|
||||
GlStateManager.color(1F, 1F, 1F, a * 4 * (1F - insideVoid));
|
||||
GlStateManager.rotate(90F, 0.5F, 0.5F, 0.0F);
|
||||
for(int p = 0; p < planetTextures.length; p++) {
|
||||
mc.renderEngine.bindTexture(planetTextures[p]);
|
||||
mc.textureManager.bindTexture(planetTextures[p]);
|
||||
tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
|
||||
tessellator.getBuffer().pos(-f17, 100.0D, -f17).tex(0.0D, 0.0D).endVertex();
|
||||
tessellator.getBuffer().pos(f17, 100.0D, -f17).tex(1.0D, 0.0D).endVertex();
|
||||
@@ -200,7 +200,7 @@ public class SkyblockSkyRenderer extends IRenderHandler {
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
// === Rays
|
||||
mc.renderEngine.bindTexture(textureSkybox);
|
||||
mc.textureManager.bindTexture(textureSkybox);
|
||||
|
||||
f17 = 20F;
|
||||
a = lowA;
|
||||
@@ -265,7 +265,7 @@ public class SkyblockSkyRenderer extends IRenderHandler {
|
||||
// === Rainbow
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
|
||||
mc.renderEngine.bindTexture(textureRainbow);
|
||||
mc.textureManager.bindTexture(textureRainbow);
|
||||
f17 = 10F;
|
||||
float effCelAng1 = celAng;
|
||||
if(effCelAng1 > 0.25F)
|
||||
@@ -311,7 +311,7 @@ public class SkyblockSkyRenderer extends IRenderHandler {
|
||||
|
||||
GlStateManager.rotate(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F);
|
||||
/*float*/ f17 = 60.0F; // Botania - 30 -> 60 and move declaration above "extra stuff"
|
||||
mc.renderEngine.bindTexture(SUN_TEXTURES);
|
||||
mc.textureManager.bindTexture(SUN_TEXTURES);
|
||||
BufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX);
|
||||
BufferBuilder.pos(-f17, 100.0D, -f17).tex(0.0D, 0.0D).endVertex();
|
||||
BufferBuilder.pos(f17, 100.0D, -f17).tex(1.0D, 0.0D).endVertex();
|
||||
@@ -319,7 +319,7 @@ public class SkyblockSkyRenderer extends IRenderHandler {
|
||||
BufferBuilder.pos(-f17, 100.0D, f17).tex(0.0D, 1.0D).endVertex();
|
||||
tessellator.draw();
|
||||
f17 = 60.0F; // Botania - 20 -> 60
|
||||
mc.renderEngine.bindTexture(MOON_PHASES_TEXTURES);
|
||||
mc.textureManager.bindTexture(MOON_PHASES_TEXTURES);
|
||||
int i = world.getMoonPhase();
|
||||
int k = i % 4;
|
||||
int i1 = i / 4 % 2;
|
||||
|
||||
@@ -40,7 +40,7 @@ import java.util.Random;
|
||||
public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable {
|
||||
|
||||
private static final VoxelShape SHAPE = makeCuboidShape(5, 5, 5, 11, 11, 11);
|
||||
private final LuminizerVariant variant;
|
||||
public final LuminizerVariant variant;
|
||||
|
||||
protected BlockLightRelay(LuminizerVariant variant, Properties builder) {
|
||||
super(builder);
|
||||
|
||||
+1
-1
@@ -177,7 +177,7 @@ public class SubTileRannuncarpus extends SubTileFunctional {
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,7 @@ public class SubTileSpectrolus extends SubTileGenerating {
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, x, y);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
}
|
||||
|
||||
|
||||
@@ -362,15 +362,15 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver,
|
||||
recipe.getOutput();
|
||||
float progress = (float) mana / (float) manaToGet;
|
||||
|
||||
mc.renderEngine.bindTexture(HUDHandler.manaBar);
|
||||
mc.textureManager.bindTexture(HUDHandler.manaBar);
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, progress == 1F ? 0 : 22, 8, 22, 15);
|
||||
|
||||
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
|
||||
if(progress == 1F) {
|
||||
mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModBlocks.livingrock), xc + radius + 16, yc + 8);
|
||||
mc.getItemRenderer().renderItemIntoGUI(new ItemStack(ModBlocks.livingrock), xc + radius + 16, yc + 8);
|
||||
GlStateManager.translate(0F, 0F, 100F);
|
||||
mc.getRenderItem().renderItemIntoGUI(new ItemStack(ModItems.twigWand), xc + radius + 24, yc + 8);
|
||||
mc.getItemRenderer().renderItemIntoGUI(new ItemStack(ModItems.twigWand), xc + radius + 24, yc + 8);
|
||||
GlStateManager.translate(0F, 0F, -100F);
|
||||
}
|
||||
|
||||
@@ -386,7 +386,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver,
|
||||
double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8;
|
||||
double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8;
|
||||
GlStateManager.translate(xPos, yPos, 0);
|
||||
mc.getRenderItem().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0);
|
||||
mc.getItemRenderer().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0);
|
||||
GlStateManager.translate(-xPos, -yPos, 0);
|
||||
|
||||
angle += anglePer;
|
||||
|
||||
@@ -102,7 +102,7 @@ public class TileTinyPotato extends TileSimpleInventory implements ITickable {
|
||||
@Override
|
||||
public void writePacketNBT(NBTTagCompound cmp) {
|
||||
super.writePacketNBT(cmp);
|
||||
cmp.setString(TAG_NAME, ITextComponent.Serializer.toJson(name));
|
||||
cmp.putString(TAG_NAME, ITextComponent.Serializer.toJson(name));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -24,8 +24,8 @@ public final class AdaptorNotifier {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onTick(ClientTickEvent event) {
|
||||
if(!triedToWarnPlayer && Minecraft.getMinecraft().player != null) {
|
||||
EntityPlayer player = Minecraft.getMinecraft().player;
|
||||
if(!triedToWarnPlayer && Minecraft.getInstance().player != null) {
|
||||
EntityPlayer player = Minecraft.getInstance().player;
|
||||
ConfigHandler.adaptor.tellChanges(player);
|
||||
|
||||
triedToWarnPlayer = true;
|
||||
|
||||
@@ -46,8 +46,8 @@ public class ThreadDownloadMod extends Thread {
|
||||
public void run() {
|
||||
try {
|
||||
ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.startingDownload", fileName));
|
||||
if(Minecraft.getMinecraft().player != null)
|
||||
Minecraft.getMinecraft().player.sendMessage(component);
|
||||
if(Minecraft.getInstance().player != null)
|
||||
Minecraft.getInstance().player.sendMessage(component);
|
||||
|
||||
VersionChecker.startedDownload = true;
|
||||
|
||||
@@ -79,8 +79,8 @@ public class ThreadDownloadMod extends Thread {
|
||||
if(!f1.exists())
|
||||
f.renameTo(f1);
|
||||
|
||||
if(Minecraft.getMinecraft().player != null)
|
||||
Minecraft.getMinecraft().player.sendMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setStyle(new Style().setColor(TextFormatting.GREEN)));
|
||||
if(Minecraft.getInstance().player != null)
|
||||
Minecraft.getInstance().player.sendMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setStyle(new Style().setColor(TextFormatting.GREEN)));
|
||||
|
||||
Desktop.getDesktop().open(dir);
|
||||
VersionChecker.downloadedFile = true;
|
||||
@@ -92,7 +92,7 @@ public class ThreadDownloadMod extends Thread {
|
||||
}
|
||||
|
||||
private void sendError() {
|
||||
if(Minecraft.getMinecraft().player != null)
|
||||
Minecraft.getMinecraft().player.sendMessage(new TextComponentTranslation("botania.versioning.error").setStyle(new Style().setColor(TextFormatting.RED)));
|
||||
if(Minecraft.getInstance().player != null)
|
||||
Minecraft.getInstance().player.sendMessage(new TextComponentTranslation("botania.versioning.error").setStyle(new Style().setColor(TextFormatting.RED)));
|
||||
}
|
||||
}
|
||||
@@ -45,9 +45,9 @@ public final class VersionChecker {
|
||||
|
||||
@SubscribeEvent
|
||||
public static void onTick(ClientTickEvent event) {
|
||||
if(event.phase == Phase.END && Minecraft.getMinecraft().player != null && !triedToWarnPlayer && doneChecking) {
|
||||
if(event.phase == Phase.END && Minecraft.getInstance().player != null && !triedToWarnPlayer && doneChecking) {
|
||||
if(!onlineVersion.isEmpty()) {
|
||||
EntityPlayer player = Minecraft.getMinecraft().player;
|
||||
EntityPlayer player = Minecraft.getInstance().player;
|
||||
int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]);
|
||||
int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD);
|
||||
if(onlineBuild > clientBuild) {
|
||||
|
||||
@@ -17,7 +17,7 @@ public class TASprite implements ISprite {
|
||||
|
||||
@Override
|
||||
public void bindTexture() {
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -304,7 +304,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
if(type == RenderType.BODY) {
|
||||
if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) {
|
||||
TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1];
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
boolean flying = player.capabilities.isFlying;
|
||||
|
||||
@@ -348,7 +348,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
h = 0.5F;
|
||||
rx = 20F;
|
||||
ry = -(float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F));
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
break;
|
||||
}
|
||||
case 5 : { // Kuroyukihime
|
||||
@@ -364,7 +364,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
break;
|
||||
}
|
||||
case 7 : { // Lyfa
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
h = -0.1F;
|
||||
rz = 0F;
|
||||
ry = -rx;
|
||||
@@ -377,7 +377,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
break;
|
||||
}
|
||||
case 9 : { // The One
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
|
||||
rz = 180F;
|
||||
rx = 0F;
|
||||
h = 1.1F;
|
||||
@@ -426,7 +426,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
GlStateManager.color(1F, 1F, 1F);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lbx, lby);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lbx, lby);
|
||||
}
|
||||
} else if(meta == 1) // Jibril's Halo
|
||||
renderHalo(player, partialTicks);
|
||||
@@ -437,12 +437,12 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.shadeModel(GL11.GL_SMOOTH);
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240);
|
||||
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, 240, 240);
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableCull();
|
||||
GlStateManager.color(1F, 1F, 1F, 1F);
|
||||
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(textureHalo);
|
||||
Minecraft.getInstance().textureManager.bindTexture(textureHalo);
|
||||
|
||||
if(player != null)
|
||||
Helper.translateToHeadLevel(player);
|
||||
|
||||
@@ -76,7 +76,7 @@ public class PageElvenRecipe extends PageRecipe {
|
||||
}
|
||||
|
||||
TextureAtlasSprite portalIcon = MiscellaneousIcons.INSTANCE.alfPortalTex;
|
||||
Minecraft.getInstance().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
((GuiScreen) gui).drawTexturedModalRect(gui.getLeft() + 22, gui.getTop() + 36, portalIcon, 48, 48);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user