mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Crash fixes, fix more blocks
This commit is contained in:
1 parent
b022c8d693
commit
b80f998688
136 files changed
+340
-261
No files matched your search
@@ -25,7 +25,12 @@ public class RecipeMiniFlower extends RecipeManaInfusion {
|
||||
@Override
|
||||
public boolean matches(ItemStack stack) {
|
||||
ResourceLocation key = BotaniaAPI.internalHandler.getStackSubTileKey(stack);
|
||||
ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(getInput().getMatchingStacks()[0]);
|
||||
ItemStack[] matching = getInput().getMatchingStacks();
|
||||
if(matching.length == 0)
|
||||
return false;
|
||||
|
||||
|
||||
ResourceLocation input = BotaniaAPI.internalHandler.getStackSubTileKey(matching[0]);
|
||||
return key != null && key.equals(input);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.entity.RenderPlayer;
|
||||
import net.minecraft.client.renderer.entity.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
@@ -167,8 +166,6 @@ public class ClientProxy implements IProxy {
|
||||
dootDoot = true;
|
||||
}
|
||||
|
||||
TileEntityItemStackRenderer.instance = new RenderTilePylon.ForwardingTEISR(TileEntityItemStackRenderer.instance);
|
||||
|
||||
DeferredWorkQueue.runLater(() -> {
|
||||
CORPOREA_REQUEST = new KeyBinding("nei.options.keys.gui.botania_corporea_request", KeyConflictContext.GUI, InputMappings.getInputByCode(GLFW.GLFW_KEY_C, 0), LibMisc.MOD_NAME);
|
||||
ClientRegistry.registerKeyBinding(ClientProxy.CORPOREA_REQUEST);
|
||||
|
||||
@@ -12,6 +12,7 @@ import net.minecraft.util.EnumFacing;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.render.tile.RenderTileGaiaHead;
|
||||
import vazkii.botania.common.block.BlockGaiaHead;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileGaiaHead;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
|
||||
@@ -31,7 +32,7 @@ public class LayerGaiaHead implements LayerRenderer<EntityPlayer> {
|
||||
public void render(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
|
||||
ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
|
||||
|
||||
if (!itemstack.isEmpty() && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head
|
||||
if (!itemstack.isEmpty() && itemstack.getItem() == ModBlocks.gaiaHead.asItem()) // Botania - check for head
|
||||
{
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
|
||||
@@ -15,7 +15,9 @@ import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
@@ -28,16 +28,6 @@ import vazkii.botania.common.block.tile.TileBrewery;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileBrewery extends TileEntityRenderer<TileBrewery> {
|
||||
public static class TEISR extends TileEntityItemStackRenderer {
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack) {
|
||||
if(stack.getItem() == ModBlocks.brewery.asItem()) {
|
||||
TileEntityRendererDispatcher.instance.getRenderer(TileBrewery.class)
|
||||
.render(null, 0, 0, 0, 0, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY);
|
||||
final ModelBrewery model = new ModelBrewery();
|
||||
public TileBrewery brewery;
|
||||
|
||||
@@ -47,16 +47,6 @@ import javax.annotation.Nullable;
|
||||
|
||||
// TODO 1.13 move this back to a normal tesr. Byebye animation API
|
||||
public class RenderTileCorporeaCrystalCube extends TileEntityRenderer<TileCorporeaCrystalCube> {
|
||||
public static class TEISR extends TileEntityItemStackRenderer {
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack) {
|
||||
if(stack.getItem() == ModBlocks.corporeaCrystalCube.asItem()) {
|
||||
TileEntityRendererDispatcher.instance.getRenderer(TileCorporeaCrystalCube.class)
|
||||
.render(null, 0, 0, 0, 0, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private EntityItem entity = null;
|
||||
private RenderEntityItem itemRenderer = null;
|
||||
|
||||
|
||||
@@ -26,16 +26,6 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class RenderTileCorporeaIndex extends TileEntityRenderer<TileCorporeaIndex> {
|
||||
public static class TEISR extends TileEntityItemStackRenderer {
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack) {
|
||||
if(stack.getItem() == ModBlocks.corporeaIndex.asItem()) {
|
||||
TileEntityRendererDispatcher.instance.getRenderer(TileCorporeaIndex.class)
|
||||
.render(null, 0, 0, 0, 0, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX);
|
||||
private final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
|
||||
public static boolean move = true;
|
||||
|
||||
@@ -33,8 +33,8 @@ import net.minecraft.util.EnumFacing;
|
||||
import vazkii.botania.client.core.helper.ShaderHelper;
|
||||
import vazkii.botania.client.render.entity.RenderDoppleganger;
|
||||
import vazkii.botania.common.block.BlockGaiaHead;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileGaiaHead;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
@@ -43,13 +43,12 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer {
|
||||
public static class TEISR extends TileEntityItemStackRenderer {
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack) {
|
||||
if(stack.getItem() == ModItems.gaiaHead) {
|
||||
TileEntityRenderer<?> ter = TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class);
|
||||
((RenderTileGaiaHead) ter).render(0.0F, 0.0F, 0.0F, null, 180.0F, BlockGaiaHead.GAIA_TYPE, null, -1, 0.0F);
|
||||
if(stack.getItem() == ModBlocks.gaiaHead.asItem()) {
|
||||
TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(TileGaiaHead.class);
|
||||
((RenderTileGaiaHead) r).render(0, 0, 0, null, 180, BlockGaiaHead.GAIA_TYPE, null, -1, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRendererDispatcher(@Nonnull TileEntityRendererDispatcher dispatcher) {
|
||||
rendererDispatcher = dispatcher;
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import java.util.Random;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -58,16 +59,14 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> implements IM
|
||||
|
||||
@Override
|
||||
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.getBlockState().getBlock() instanceof BlockPylon)))
|
||||
if(!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || !(pylon.getBlockState().getBlock() instanceof BlockPylon))
|
||||
return;
|
||||
|
||||
renderPylon(pylon, d0, d1, d2, pticks, renderingItem);
|
||||
renderPylon(pylon, d0, d1, d2, pticks);
|
||||
}
|
||||
|
||||
private void renderPylon(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, boolean renderingItem) {
|
||||
BlockPylon.Variant type = renderingItem ? forceVariant : ((BlockPylon) pylon.getBlockState().getBlock()).variant;
|
||||
private void renderPylon(@Nullable TilePylon pylon, double d0, double d1, double d2, float pticks) {
|
||||
BlockPylon.Variant type = pylon == null ? forceVariant : ((BlockPylon) pylon.getBlockState().getBlock()).variant;
|
||||
IPylonModel model;
|
||||
switch(type) {
|
||||
default:
|
||||
@@ -97,36 +96,36 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> implements IM
|
||||
|
||||
double worldTime = (double) (ClientTickHandler.ticksInGame + pticks);
|
||||
|
||||
worldTime += renderingItem ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360);
|
||||
worldTime += pylon == null ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360);
|
||||
|
||||
GlStateManager.translated(d0, d1 + (renderingItem ? 1.35 : 1.5), d2);
|
||||
GlStateManager.translated(d0, d1 + (pylon == null ? 1.35 : 1.5), d2);
|
||||
GlStateManager.scalef(1.0F, -1.0F, -1.0F);
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translatef(0.5F, 0F, -0.5F);
|
||||
if(!renderingItem)
|
||||
if(pylon != null)
|
||||
GlStateManager.rotatef((float) worldTime * 1.5F, 0F, 1F, 0F);
|
||||
|
||||
model.renderRing();
|
||||
if(!renderingItem)
|
||||
if(pylon != null)
|
||||
GlStateManager.translated(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D);
|
||||
GlStateManager.popMatrix();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
if(!renderingItem)
|
||||
if(pylon != null)
|
||||
GlStateManager.translated(0D, Math.sin(worldTime / 20D) / 17.5, 0D);
|
||||
|
||||
GlStateManager.translatef(0.5F, 0F, -0.5F);
|
||||
if(!renderingItem)
|
||||
if(pylon != null)
|
||||
GlStateManager.rotatef((float) -worldTime, 0F, 1F, 0F);
|
||||
|
||||
GlStateManager.disableCull();
|
||||
GlStateManager.disableAlphaTest();
|
||||
|
||||
if(!renderingItem)
|
||||
if(pylon != null)
|
||||
ShaderHelper.useShader(ShaderHelper.pylonGlow);
|
||||
model.renderCrystal();
|
||||
if(!renderingItem)
|
||||
if(pylon != null)
|
||||
ShaderHelper.releaseShader();
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
@@ -138,23 +137,13 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> implements IM
|
||||
GlStateManager.popMatrix();
|
||||
}
|
||||
|
||||
// Dirty hack to make the TESR know which variant of pylon it's rendering
|
||||
public static class ForwardingTEISR extends TileEntityItemStackRenderer {
|
||||
private static final TilePylon DUMMY = new TilePylon();
|
||||
|
||||
private final TileEntityItemStackRenderer compose;
|
||||
|
||||
public ForwardingTEISR(TileEntityItemStackRenderer compose) {
|
||||
this.compose = compose;
|
||||
}
|
||||
|
||||
public static class TEISR extends TileEntityItemStackRenderer {
|
||||
@Override
|
||||
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, 0);
|
||||
} else {
|
||||
compose.renderByItem(stack);
|
||||
TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(TilePylon.class);
|
||||
((RenderTilePylon) r).renderPylon(null, 0, 0, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -163,7 +152,7 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> implements IM
|
||||
public void renderBlockForMultiblock(IBlockReader world, Multiblock mb, IBlockState state, MultiblockComponent comp) {
|
||||
forceVariant = ((BlockPylon) state.getBlock()).variant;
|
||||
GlStateManager.translatef(-0.5F, -0.25F, -0.5F);
|
||||
renderPylon((TilePylon) comp.getTileEntity(), 0, 0, 0, 0, true);
|
||||
renderPylon(null, 0, 0, 0, 0);
|
||||
forceVariant = BlockPylon.Variant.MANA;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package vazkii.botania.client.render.tile;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IItemProvider;
|
||||
|
||||
public class TEISR extends TileEntityItemStackRenderer {
|
||||
private final IItemProvider item;
|
||||
private final Class<? extends TileEntity> clazz;
|
||||
|
||||
public TEISR(IItemProvider item, Class<? extends TileEntity> clazz) {
|
||||
this.item = Preconditions.checkNotNull(item);
|
||||
this.clazz = clazz;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderByItem(ItemStack stack) {
|
||||
if(stack.getItem() == item.asItem()) {
|
||||
TileEntityRendererDispatcher.instance.getRenderer(clazz)
|
||||
.render(null, 0,0, 0, 0, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -33,6 +33,8 @@ import vazkii.botania.api.subtile.SubTileEntity;
|
||||
import vazkii.botania.client.render.tile.RenderTileBrewery;
|
||||
import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube;
|
||||
import vazkii.botania.client.render.tile.RenderTileCorporeaIndex;
|
||||
import vazkii.botania.client.render.tile.RenderTilePylon;
|
||||
import vazkii.botania.client.render.tile.TEISR;
|
||||
import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube;
|
||||
import vazkii.botania.common.block.corporea.BlockCorporeaFunnel;
|
||||
import vazkii.botania.common.block.corporea.BlockCorporeaIndex;
|
||||
@@ -647,9 +649,10 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockPool(dilutedPool, props).setRegistryName(dilutedPool.getRegistryName()));
|
||||
r.register(new ItemBlockPool(fabulousPool, props).setRegistryName(fabulousPool.getRegistryName()));
|
||||
r.register(new ItemBlockMod(runeAltar, props).setRegistryName(runeAltar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaPylon, props).setRegistryName(manaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(naturaPylon, props).setRegistryName(naturaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(gaiaPylon, props).setRegistryName(gaiaPylon.getRegistryName()));
|
||||
Item.Properties pylonProps = ModItems.defaultBuilder().setTEISR(() -> RenderTilePylon.TEISR::new);
|
||||
r.register(new ItemBlockMod(manaPylon, pylonProps).setRegistryName(manaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(naturaPylon, pylonProps).setRegistryName(naturaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(gaiaPylon, pylonProps).setRegistryName(gaiaPylon.getRegistryName()));
|
||||
r.register(new ItemBlockMod(pistonRelay, props).setRegistryName(pistonRelay.getRegistryName()));
|
||||
r.register(new ItemBlockMod(distributor, props).setRegistryName(distributor.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaVoid, props).setRegistryName(manaVoid.getRegistryName()));
|
||||
@@ -730,7 +733,7 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(starfield, props).setRegistryName(starfield.getRegistryName()));
|
||||
r.register(new ItemBlockMod(rfGenerator, props).setRegistryName(rfGenerator.getRegistryName()));
|
||||
r.register(new ItemBlockElven(elfGlass, props).setRegistryName(elfGlass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> RenderTileBrewery.TEISR::new)).setRegistryName(brewery.getRegistryName()));
|
||||
r.register(new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))).setRegistryName(brewery.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaGlass, props).setRegistryName(manaGlass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(terraPlate, props).setRegistryName(terraPlate.getRegistryName()));
|
||||
r.register(new ItemBlockMod(redStringContainer, props).setRegistryName(redStringContainer.getRegistryName()));
|
||||
@@ -757,7 +760,7 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(petalBlockGreen, props).setRegistryName(petalBlockGreen.getRegistryName()));
|
||||
r.register(new ItemBlockMod(petalBlockRed, props).setRegistryName(petalBlockRed.getRegistryName()));
|
||||
r.register(new ItemBlockMod(petalBlockBlack, props).setRegistryName(petalBlockBlack.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> RenderTileCorporeaIndex.TEISR::new)).setRegistryName(corporeaIndex.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))).setRegistryName(corporeaIndex.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaFunnel, props).setRegistryName(corporeaFunnel.getRegistryName()));
|
||||
r.register(new ItemBlockMod(whiteMushroom, props).setRegistryName(whiteMushroom.getRegistryName()));
|
||||
r.register(new ItemBlockMod(orangeMushroom, props).setRegistryName(orangeMushroom.getRegistryName()));
|
||||
@@ -794,9 +797,9 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(doubleFlowerBlack, props).setRegistryName(doubleFlowerBlack.getRegistryName()));
|
||||
r.register(new ItemBlockBlaze(blazeBlock, props).setRegistryName(blazeBlock.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaInterceptor, props).setRegistryName(corporeaInterceptor.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> RenderTileCorporeaCrystalCube.TEISR::new)).setRegistryName(corporeaCrystalCube.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaCrystalCube, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaCrystalCube, TileCorporeaCrystalCube.class))).setRegistryName(corporeaCrystalCube.getRegistryName()));
|
||||
r.register(new ItemBlockMod(incensePlate, props).setRegistryName(incensePlate.getRegistryName()));
|
||||
r.register(new ItemBlockMod(hourglass, props).setRegistryName(hourglass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))).setRegistryName(hourglass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(ghostRail, props).setRegistryName(ghostRail.getRegistryName()));
|
||||
r.register(new ItemBlockMod(sparkChanger, props).setRegistryName(sparkChanger.getRegistryName()));
|
||||
r.register(new ItemBlockMod(root, props).setRegistryName(root.getRegistryName()));
|
||||
@@ -808,15 +811,15 @@ public final class ModBlocks {
|
||||
r.register(new ItemBlockMod(lightLauncher, props).setRegistryName(lightLauncher.getRegistryName()));
|
||||
r.register(new ItemBlockMod(manaBomb, props).setRegistryName(manaBomb.getRegistryName()));
|
||||
r.register(new ItemBlockMod(cacophonium, props).setRegistryName(cacophonium.getRegistryName()));
|
||||
r.register(new ItemBlockMod(bellows, props).setRegistryName(bellows.getRegistryName()));
|
||||
r.register(new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))).setRegistryName(bellows.getRegistryName()));
|
||||
r.register(new ItemBlockMod(bifrostPerm, props).setRegistryName(bifrostPerm.getRegistryName()));
|
||||
r.register(new ItemBlockMod(cellBlock, props).setRegistryName(cellBlock.getRegistryName()));
|
||||
r.register(new ItemBlockMod(redStringInterceptor, props).setRegistryName(redStringInterceptor.getRegistryName()));
|
||||
r.register(new ItemBlockMod(corporeaRetainer, props).setRegistryName(corporeaRetainer.getRegistryName()));
|
||||
r.register(new ItemBlockMod(teruTeruBozu, props).setRegistryName(teruTeruBozu.getRegistryName()));
|
||||
r.register(new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))).setRegistryName(teruTeruBozu.getRegistryName()));
|
||||
r.register(new ItemBlockMod(shimmerrock, props).setRegistryName(shimmerrock.getRegistryName()));
|
||||
r.register(new ItemBlockMod(shimmerwoodPlanks, props).setRegistryName(shimmerwoodPlanks.getRegistryName()));
|
||||
r.register(new ItemBlockMod(avatar, props).setRegistryName(avatar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))).setRegistryName(avatar.getRegistryName()));
|
||||
r.register(new ItemBlockMod(dryGrass, props).setRegistryName(dryGrass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(goldenGrass, props).setRegistryName(goldenGrass.getRegistryName()));
|
||||
r.register(new ItemBlockMod(vividGrass, props).setRegistryName(vividGrass.getRegistryName()));
|
||||
|
||||
@@ -303,7 +303,7 @@ public final class BotaniaCreativeTab extends ItemGroup {
|
||||
addItem(ModItems.ancientWillVerac);
|
||||
addItem(ModItems.ancientWillKaril);
|
||||
addItem(ModItems.pinkinator);
|
||||
addItem(ModItems.gaiaHead);
|
||||
addItem(ModBlocks.gaiaHead);
|
||||
if(ConfigHandler.COMMON.relicsEnabled.get()) {
|
||||
addItem(ModItems.dice);
|
||||
addItem(ModItems.infiniteFruit);
|
||||
|
||||
@@ -25,7 +25,9 @@ import vazkii.botania.api.mana.spark.SparkUpgradeType;
|
||||
import vazkii.botania.api.item.IAncientWillContainer;
|
||||
import vazkii.botania.api.state.enums.CratePattern;
|
||||
import vazkii.botania.client.render.tile.RenderTileGaiaHead;
|
||||
import vazkii.botania.client.render.tile.TEISR;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileGaiaHead;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.item.brew.*;
|
||||
@@ -384,7 +386,6 @@ public final class ModItems {
|
||||
public static final Item manaweaveLegs = new ItemManaweaveArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS);
|
||||
public static final Item manaweaveBoots = new ItemManaweaveArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS);
|
||||
public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO);
|
||||
@ObjectHolder("botania:" + LibBlockNames.GAIA_HEAD) public static Item gaiaHead;
|
||||
public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT);
|
||||
public static final Item speedUpBelt = new ItemSpeedUpBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPEED_UP_BELT);
|
||||
public static final Item baubleBox = new ItemBaubleBox(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BAUBLE_BOX);
|
||||
|
||||
+2
-1
@@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.entity.EntityDoppleganger;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
@@ -49,7 +50,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe {
|
||||
ItemNBTHelper.setString(stack, "SkullOwner", ((EntityPlayer) event.getEntityLiving()).getGameProfile().getName());
|
||||
addDrop(event, stack);
|
||||
} else if(event.getEntityLiving() instanceof EntityDoppleganger && rand.nextInt(13) < 1 + looting)
|
||||
addDrop(event, new ItemStack(ModItems.gaiaHead));
|
||||
addDrop(event, new ItemStack(ModBlocks.gaiaHead));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/animated_torch" }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "minecraft:blocks/redstone_torch_on"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "botania:blocks/livingwood0"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
"": { "model": "botania:block/bellows" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/black_buried_petals" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/blue_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "botania:blocks/livingrock0"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
"": { "model": "botania:block/brewery" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/brown_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy"
|
||||
},
|
||||
"variants": {
|
||||
"color": {
|
||||
"white": { "textures": { "particle": "minecraft:blocks/wool_colored_white" }},
|
||||
"orange": { "textures": { "particle": "minecraft:blocks/wool_colored_orange" }},
|
||||
"magenta": { "textures": { "particle": "minecraft:blocks/wool_colored_magenta" }},
|
||||
"light_blue": { "textures": { "particle": "minecraft:blocks/wool_colored_light_blue" }},
|
||||
"yellow": { "textures": { "particle": "minecraft:blocks/wool_colored_yellow" }},
|
||||
"lime": { "textures": { "particle": "minecraft:blocks/wool_colored_lime" }},
|
||||
"pink": { "textures": { "particle": "minecraft:blocks/wool_colored_pink" }},
|
||||
"gray": { "textures": { "particle": "minecraft:blocks/wool_colored_gray" }},
|
||||
"silver": { "textures": { "particle": "minecraft:blocks/wool_colored_silver" }},
|
||||
"cyan": { "textures": { "particle": "minecraft:blocks/wool_colored_cyan" }},
|
||||
"purple": { "textures": { "particle": "minecraft:blocks/wool_colored_purple" }},
|
||||
"blue": { "textures": { "particle": "minecraft:blocks/wool_colored_blue" }},
|
||||
"brown": { "textures": { "particle": "minecraft:blocks/wool_colored_brown" }},
|
||||
"green": { "textures": { "particle": "minecraft:blocks/wool_colored_green" }},
|
||||
"red": { "textures": { "particle": "minecraft:blocks/wool_colored_red" }},
|
||||
"black": { "textures": { "particle": "minecraft:blocks/wool_colored_black" }}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/livingrock_chiseled_brick" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/corporea_index" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "botania:blocks/storage2"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/livingrock_cracked_brick" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/cyan_buried_petals" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,12 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "minecraft:blocks/soul_sand"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
"": { "model": "botania:block/gaia_head" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/gaia_head" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/gray_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/green_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "botania:blocks/mana_glass"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
"": { "model": "botania:block/hourglass" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/light_blue_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/light_gray_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/lime_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"variant=default": { "model": "botania:block/livingrock" },
|
||||
"variant=brick": { "model": "botania:block/livingrock_brick" },
|
||||
"variant=mossy_brick": { "model": "botania:block/livingrock_mossy_brick" },
|
||||
"variant=cracked_brick": { "model": "botania:block/livingrock_cracked_brick" },
|
||||
"variant=chiseled_brick": { "model": "botania:block/livingrock_chiseled_brick" }
|
||||
"": { "model": "botania:block/livingrock" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/livingrock_brick" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/magenta_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,5 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "minecraft:blocks/fire_layer_0"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}],
|
||||
"inventory": [{
|
||||
"model": "builtin/generated",
|
||||
"textures": {
|
||||
"layer0": "minecraft:blocks/fire_layer_0"
|
||||
},
|
||||
"transform": "forge:default-item"
|
||||
}]
|
||||
"": { "model": "botania:block/mana_flame" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/livingrock_mossy_brick" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/orange_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/pink_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"has_lens=false,powered=false": { "model": "botania:block/prism" },
|
||||
"has_lens=true,powered=false": { "model": "botania:block/prism" },
|
||||
"has_lens=false,powered=true": { "model": "botania:block/prism" },
|
||||
"has_lens=true,powered=true": { "model": "botania:block/prism" }
|
||||
"": { "model": "botania:block/prism" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/purple_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/red_buried_petals" }
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:teru_teru_bozu" }
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"defaults": {
|
||||
"model": "botania:block/dummy",
|
||||
"textures": {
|
||||
"particle": "minecraft:blocks/wool_colored_white"
|
||||
}
|
||||
},
|
||||
"variants": {
|
||||
"": [{}]
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/white_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"variants": {
|
||||
"": { "model": "botania:block/yellow_buried_petals" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/redstone_torch"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "botania:blocks/livingwood0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/black_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/blue_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "botania:blocks/livingrock0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/brown_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "botania:blocks/storage2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/cyan_wool"
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"bottom": "minecraft:block/dirt",
|
||||
"top": "botania:blocks/altgrass0",
|
||||
"side": "botania:blocks/altgrass1"
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"__comment": "Dummy for TESRS that still want to set their block break particle without using code",
|
||||
"elements": [
|
||||
{
|
||||
"from": [0, 0, 0],
|
||||
"to": [0, 0, 0],
|
||||
"faces": {
|
||||
"up": { "uv": [ 0, 0, 0, 0 ], "texture": "dummythatwillnevergetrendered" }
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"bottom": "minecraft:block/dirt",
|
||||
"top": "botania:blocks/enchantedsoil0",
|
||||
"side": "botania:blocks/enchantedsoil1"
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"parent": "minecraft:block/orientable",
|
||||
"textures": {
|
||||
"top": "minecraft:blocks/pumpkin_top",
|
||||
"top": "minecraft:block/pumpkin_top",
|
||||
"front": "botania:blocks/pumpkin_fel",
|
||||
"side": "minecraft:blocks/pumpkin_side"
|
||||
"side": "minecraft:block/pumpkin_side"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/soul_sand"
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"bottom": "minecraft:block/dirt",
|
||||
"top": "botania:blocks/altgrass2",
|
||||
"side": "botania:blocks/altgrass3"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/gray_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/green_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "botania:blocks/mana_glass"
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"bottom": "minecraft:block/dirt",
|
||||
"top": "botania:blocks/altgrass8",
|
||||
"side": "botania:blocks/altgrass9"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/light_blue_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/light_gray_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/lime_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/magenta_wool"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/fire_0"
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"textures": {
|
||||
"bottom": "minecraft:blocks/dirt",
|
||||
"bottom": "minecraft:block/dirt",
|
||||
"top": "botania:blocks/altgrass10",
|
||||
"side": "botania:blocks/altgrass11"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"textures": {
|
||||
"particle": "minecraft:block/orange_wool"
|
||||
}
|
||||
}
|
||||
Loaded 100 of 136 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user