mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Lots of work
This commit is contained in:
1 parent
98b74dc69b
commit
17ccb624f8
236 files changed
+839
-1015
No files matched your search
@@ -9,7 +9,7 @@
|
||||
package vazkii.botania.api;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.ai.attributes.IAttribute;
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.entity.ai.attributes.RangedAttribute;
|
||||
import net.minecraft.inventory.EquipmentSlotType;
|
||||
import net.minecraft.item.DyeColor;
|
||||
@@ -128,6 +128,11 @@ public interface BotaniaAPI {
|
||||
public float getToughness() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float func_230304_f_() {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
IItemTier DUMMY_ITEM_TIER = new IItemTier() {
|
||||
@@ -200,7 +205,4 @@ public interface BotaniaAPI {
|
||||
return new DummyMethodHandler();
|
||||
}
|
||||
|
||||
default IAttribute getPixieSpawnChanceAttribute() {
|
||||
return new RangedAttribute(null, "missingno", 0, 0, 0);
|
||||
}
|
||||
}
|
||||
@@ -10,8 +10,8 @@ package vazkii.botania.api.item;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
|
||||
/**
|
||||
* A few helper methods for the render.
|
||||
|
||||
@@ -18,7 +18,7 @@ public enum AlfPortalState implements IStringSerializable {
|
||||
ON_X;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String func_176610_l() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public enum CratePattern implements IStringSerializable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String func_176610_l() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
}
|
||||
@@ -19,7 +19,7 @@ public enum LuminizerVariant implements IStringSerializable {
|
||||
TOGGLE;
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String func_176610_l() {
|
||||
return name().toLowerCase(Locale.ROOT);
|
||||
}
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.LootContext;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.play.server.SUpdateTileEntityPacket;
|
||||
@@ -29,7 +30,6 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.storage.loot.LootContext;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.client.model.ModelDataManager;
|
||||
@@ -122,7 +122,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile
|
||||
@Override
|
||||
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
|
||||
if (cap == FLOATING_FLOWER_CAP) {
|
||||
if (hasWorld() && getBlockState().isIn(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS)) {
|
||||
if (hasWorld() && getBlockState().func_235714_a_(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS)) {
|
||||
return floatingDataCap.cast();
|
||||
}
|
||||
}
|
||||
@@ -155,8 +155,8 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void read(CompoundNBT cmp) {
|
||||
super.read(cmp);
|
||||
public final void func_230337_a_(BlockState state, CompoundNBT cmp) {
|
||||
super.func_230337_a_(state, cmp);
|
||||
if (cmp.contains(TAG_TICKS_EXISTED)) {
|
||||
ticksExisted = cmp.getInt(TAG_TICKS_EXISTED);
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.IEntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
|
||||
import net.minecraft.client.renderer.entity.model.PlayerModel;
|
||||
@@ -25,6 +24,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Effects;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import top.theillusivec4.curios.api.CuriosAPI;
|
||||
import top.theillusivec4.curios.api.capability.CuriosCapability;
|
||||
import top.theillusivec4.curios.api.inventory.CurioStackHandler;
|
||||
|
||||
@@ -14,12 +14,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.*;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||
|
||||
import vazkii.botania.api.subtile.RadiusDescriptor;
|
||||
|
||||
@@ -24,6 +24,7 @@ import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
|
||||
@@ -110,7 +110,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
|
||||
String rawName = value.toLowerCase(Locale.ROOT);
|
||||
String flowerName = LEGACY_FLOWER_NAMES.getOrDefault(rawName, rawName);
|
||||
|
||||
Item item = ModTags.Items.SPECIAL_FLOWERS.getAllElements().stream()
|
||||
Item item = ModTags.Items.SPECIAL_FLOWERS.func_230236_b_().stream()
|
||||
.filter(flower -> Registry.ITEM.getKey(flower).getPath().equals(flowerName))
|
||||
.findFirst().orElse(Items.POPPY);
|
||||
m.put(key, new ItemStack(item));
|
||||
@@ -124,7 +124,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
|
||||
getEntityModel().bipedHead.translateRotate(ms);
|
||||
ms.translate(-0.15F, -0.60F, 0F);
|
||||
ms.scale(0.4F, -0.4F, -0.4F);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, MiscellaneousIcons.INSTANCE.goldfishModel, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentCullBlockType()), null, MiscellaneousIcons.INSTANCE.goldfishModel, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY);
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
|
||||
@@ -52,12 +52,12 @@ public class CorporeaInputHandler {
|
||||
int count = 1;
|
||||
int max = stack.getMaxStackSize();
|
||||
|
||||
if (Screen.hasShiftDown()) {
|
||||
if (Screen.func_231173_s_()) {
|
||||
count = max;
|
||||
if (Screen.hasControlDown()) {
|
||||
if (Screen.func_231172_r_()) {
|
||||
count /= 4;
|
||||
}
|
||||
} else if (Screen.hasControlDown()) {
|
||||
} else if (Screen.func_231172_r_()) {
|
||||
count = max / 2;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,11 +10,11 @@ package vazkii.botania.client.core.handler;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.util.RegistryKey;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.dimension.DimensionType;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
import net.minecraftforge.fml.ModContainer;
|
||||
import net.minecraftforge.fml.ModList;
|
||||
@@ -49,15 +49,15 @@ public final class DebugHandler {
|
||||
event.getLeft().add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version);
|
||||
|
||||
if (Minecraft.getInstance().isSingleplayer()) {
|
||||
DimensionType dim = Minecraft.getInstance().world.getDimension().getType();
|
||||
ResourceLocation dimName = Registry.DIMENSION_TYPE.getKey(dim);
|
||||
RegistryKey<World> dim = Minecraft.getInstance().world.func_234923_W_();
|
||||
ResourceLocation dimName = dim.func_240901_a_();
|
||||
if (ServerLifecycleHooks.getCurrentServer() != null) {
|
||||
World serverWorld = ServerLifecycleHooks.getCurrentServer().getWorld(dim);
|
||||
event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER %s) netColl : %d, netPool: %d", dimName, ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size()));
|
||||
}
|
||||
}
|
||||
|
||||
if (Screen.hasControlDown() && Screen.hasShiftDown()) {
|
||||
if (Screen.func_231172_r_() && Screen.func_231173_s_()) {
|
||||
event.getLeft().add(PREFIX + "Config Context");
|
||||
event.getLeft().add(" shaders.enabled: " + ConfigHandler.CLIENT.useShaders.get());
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@ package vazkii.botania.client.core.handler;
|
||||
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.Material;
|
||||
import net.minecraft.client.renderer.model.ModelBakery;
|
||||
import net.minecraft.client.renderer.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.model.RenderMaterial;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.tileentity.BannerPattern;
|
||||
@@ -86,9 +86,9 @@ public class MiscellaneousIcons {
|
||||
public final IBakedModel[] kingKeyWeaponModels = new IBakedModel[ItemKingKey.WEAPON_TYPES];
|
||||
|
||||
public void onModelRegister(ModelRegistryEvent evt) {
|
||||
Set<Material> materials;
|
||||
Set<RenderMaterial> materials;
|
||||
try {
|
||||
materials = (Set<Material>) MATERIALS.invokeExact();
|
||||
materials = (Set<RenderMaterial>) MATERIALS.invokeExact();
|
||||
} catch (Throwable throwable) {
|
||||
throw new RuntimeException(throwable);
|
||||
}
|
||||
@@ -97,8 +97,8 @@ public class MiscellaneousIcons {
|
||||
materials.add(RenderLexicon.ELVEN_TEXTURE);
|
||||
for (BannerPattern pattern : BannerPattern.values()) {
|
||||
if (pattern.getFileName().startsWith(LibMisc.MOD_ID)) {
|
||||
materials.add(new Material(Atlases.SHIELD_ATLAS, pattern.func_226957_a_(false)));
|
||||
materials.add(new Material(Atlases.BANNER_ATLAS, pattern.func_226957_a_(true)));
|
||||
materials.add(new RenderMaterial(Atlases.SHIELD_ATLAS, pattern.func_226957_a_(false)));
|
||||
materials.add(new RenderMaterial(Atlases.BANNER_ATLAS, pattern.func_226957_a_(true)));
|
||||
}
|
||||
}
|
||||
ModelLoader.addSpecialModel(prefix("icon/goldfish"));
|
||||
|
||||
@@ -16,7 +16,7 @@ import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.*;
|
||||
import net.minecraft.client.renderer.entity.model.BookModel;
|
||||
import net.minecraft.client.renderer.model.Material;
|
||||
import net.minecraft.client.renderer.model.RenderMaterial;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
@@ -25,6 +25,7 @@ import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.HandSide;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.client.event.RenderHandEvent;
|
||||
|
||||
@@ -46,8 +47,8 @@ public class RenderLexicon {
|
||||
private static final MethodHandle APPLY_SWING_OFFSET = LibObfuscation.getMethod(FirstPersonRenderer.class, "func_228399_a_", MatrixStack.class, HandSide.class, float.class);
|
||||
private static final BookModel model = new BookModel();
|
||||
private static final boolean SHOULD_MISSPELL = Math.random() < 0.0004;
|
||||
public static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_DEFAULT));
|
||||
public static final Material ELVEN_TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_ELVEN));
|
||||
public static final RenderMaterial TEXTURE = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_DEFAULT));
|
||||
public static final RenderMaterial ELVEN_TEXTURE = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_ELVEN));
|
||||
|
||||
private static final String[] QUOTES = new String[] {
|
||||
"\"Neat!\" - Direwolf20",
|
||||
@@ -145,7 +146,7 @@ public class RenderLexicon {
|
||||
float rightPageAngle = MathHelper.frac(pageFlip + 0.75F) * 1.6F - 0.3F;
|
||||
model.func_228247_a_(ClientTickHandler.total, MathHelper.clamp(leftPageAngle, 0.0F, 1.0F), MathHelper.clamp(rightPageAngle, 0.0F, 1.0F), opening);
|
||||
|
||||
Material mat = ((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? ELVEN_TEXTURE : TEXTURE;
|
||||
RenderMaterial mat = ((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? ELVEN_TEXTURE : TEXTURE;
|
||||
IVertexBuilder buffer = mat.getBuffer(buffers, RenderType::getEntitySolid);
|
||||
model.render(ms, buffer, light, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1);
|
||||
|
||||
|
||||
@@ -28,12 +28,12 @@ public final class TooltipHandler {
|
||||
}
|
||||
|
||||
public static ITextComponent getShiftInfoTooltip() {
|
||||
ITextComponent shift = new StringTextComponent("SHIFT").applyTextStyle(TextFormatting.AQUA);
|
||||
return new TranslationTextComponent("botaniamisc.shiftinfo", shift).applyTextStyle(TextFormatting.GRAY);
|
||||
ITextComponent shift = new StringTextComponent("SHIFT").func_240699_a_(TextFormatting.AQUA);
|
||||
return new TranslationTextComponent("botaniamisc.shiftinfo", shift).func_240699_a_(TextFormatting.GRAY);
|
||||
}
|
||||
|
||||
public static void addOnShift(List<ITextComponent> tooltip, Runnable lambda) {
|
||||
if (Screen.hasShiftDown()) {
|
||||
if (Screen.func_231173_s_()) {
|
||||
lambda.run();
|
||||
} else {
|
||||
tooltip.add(getShiftInfoTooltip());
|
||||
|
||||
@@ -11,8 +11,8 @@ package vazkii.botania.client.core.helper;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
|
||||
public final class IconHelper {
|
||||
/**
|
||||
|
||||
@@ -28,6 +28,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
|
||||
@@ -86,7 +88,7 @@ public final class RenderHelper {
|
||||
RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true);
|
||||
RenderState.AlphaState zeroAlpha = new RenderState.AlphaState(0);
|
||||
RenderState.AlphaState oneTenthAlpha = new RenderState.AlphaState(0.004F);
|
||||
RenderState.DepthTestState noDepth = new RenderState.DepthTestState(GL11.GL_ALWAYS);
|
||||
RenderState.DepthTestState noDepth = new RenderState.DepthTestState("always", GL11.GL_ALWAYS);
|
||||
boolean useShaders = ShaderHelper.useShaders();
|
||||
|
||||
RenderType.State glState = RenderType.State.getBuilder().shadeModel(smoothShade)
|
||||
@@ -161,7 +163,7 @@ public final class RenderHelper {
|
||||
GAIA_PYLON_GLOW = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, gaiaPylonGlow) : gaiaPylonGlow;
|
||||
|
||||
// Same as entity_translucent, with no depth test and a shader
|
||||
glState = RenderType.State.getBuilder().depthTest(new RenderState.DepthTestState(GL11.GL_ALWAYS)).texture(new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, false)).transparency(TRANSLUCENT_TRANSPARENCY).diffuseLighting(enableDiffuse).alpha(oneTenthAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
|
||||
glState = RenderType.State.getBuilder().depthTest(new RenderState.DepthTestState("always", GL11.GL_ALWAYS)).texture(new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, false)).transparency(TRANSLUCENT_TRANSPARENCY).diffuseLighting(enableDiffuse).alpha(oneTenthAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
|
||||
ShaderCallback cb = shader -> {
|
||||
int alpha = GlStateManager.getUniformLocation(shader, "alpha");
|
||||
ShaderHelper.FLOAT_BUF.position(0);
|
||||
|
||||
@@ -17,12 +17,12 @@ import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.client.renderer.ActiveRenderInfo;
|
||||
import net.minecraft.client.renderer.BufferBuilder;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceContext;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import vazkii.botania.client.core.handler.LightningHandler;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
@@ -46,7 +46,7 @@ public class FXLightning extends Particle {
|
||||
private int splitCount;
|
||||
private float speed = 1.5F;
|
||||
|
||||
public FXLightning(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) {
|
||||
public FXLightning(ClientWorld world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) {
|
||||
super(world, sourcevec.x, sourcevec.y, sourcevec.z);
|
||||
rand = new Random(seed);
|
||||
speed = ticksPerMeter;
|
||||
|
||||
@@ -22,7 +22,7 @@ import net.minecraft.client.renderer.texture.TextureManager;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -11,8 +11,8 @@ package vazkii.botania.client.fx;
|
||||
import net.minecraft.client.particle.IAnimatedSprite;
|
||||
import net.minecraft.client.particle.IParticleFactory;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.particles.ParticleType;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class SparkleParticleType extends ParticleType<SparkleParticleData> {
|
||||
public SparkleParticleType() {
|
||||
@@ -27,7 +27,7 @@ public class SparkleParticleType extends ParticleType<SparkleParticleData> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Particle makeParticle(SparkleParticleData data, World world, double x, double y, double z, double mx, double my, double mz) {
|
||||
public Particle makeParticle(SparkleParticleData data, ClientWorld world, double x, double y, double z, double mx, double my, double mz) {
|
||||
return new FXSparkle(world, x, y, z, data.size, data.r, data.g, data.b, data.m, data.fake, data.noClip, data.corrupt, sprite);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ package vazkii.botania.client.fx;
|
||||
import net.minecraft.client.particle.IAnimatedSprite;
|
||||
import net.minecraft.client.particle.IParticleFactory;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.particles.ParticleType;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class WispParticleType extends ParticleType<WispParticleData> {
|
||||
public WispParticleType() {
|
||||
@@ -27,7 +27,7 @@ public class WispParticleType extends ParticleType<WispParticleData> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Particle makeParticle(WispParticleData data, World world, double x, double y, double z, double mx, double my, double mz) {
|
||||
public Particle makeParticle(WispParticleData data, ClientWorld world, double x, double y, double z, double mx, double my, double mz) {
|
||||
FXWisp ret = new FXWisp(world, x, y, z, mx, my, mz, data.size, data.r, data.g, data.b, data.depthTest, data.maxAgeMul, data.noClip);
|
||||
ret.selectSpriteRandomly(sprite);
|
||||
return ret;
|
||||
|
||||
@@ -18,7 +18,7 @@ import net.minecraft.client.renderer.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.ILightReader;
|
||||
import net.minecraft.world.IBlockDisplayReader;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -97,7 +97,7 @@ public class DelegatedModel implements IBakedModel {
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IModelData getModelData(@Nonnull ILightReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) {
|
||||
public IModelData getModelData(@Nonnull IBlockDisplayReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) {
|
||||
return originalModel.getModelData(world, pos, state, tileData);
|
||||
}
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.*;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.resources.IResourceManager;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraftforge.client.model.*;
|
||||
import net.minecraftforge.client.model.data.EmptyModelData;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
@@ -48,8 +48,8 @@ public class FloatingFlowerModel implements IModelGeometry<FloatingFlowerModel>
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
|
||||
Set<Material> ret = new HashSet<>();
|
||||
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
|
||||
Set<RenderMaterial> ret = new HashSet<>();
|
||||
for (Map.Entry<IFloatingFlower.IslandType, ResourceLocation> e : BotaniaAPIClient.instance().getRegisteredIslandTypeModels().entrySet()) {
|
||||
IUnbakedModel unbakedIsland = modelGetter.apply(e.getValue());
|
||||
ret.addAll(unbakedIsland.getTextures(modelGetter, missingTextureErrors));
|
||||
@@ -61,7 +61,7 @@ public class FloatingFlowerModel implements IModelGeometry<FloatingFlowerModel>
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation name) {
|
||||
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation name) {
|
||||
final TransformationMatrix moveFlower = new TransformationMatrix(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null);
|
||||
IModelTransform comp = new ModelTransformComposition(new SimpleModelTransform(moveFlower), transform);
|
||||
IBakedModel bakedFlower = unbakedFlower.bakeModel(bakery, spriteGetter, comp, name);
|
||||
|
||||
@@ -13,15 +13,16 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.TransformationMatrix;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.*;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.vector.TransformationMatrix;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.model.BakedModelWrapper;
|
||||
@@ -58,7 +59,7 @@ public class GunModel implements IBakedModel {
|
||||
private final ItemOverrideList itemHandler = new ItemOverrideList() {
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable LivingEntity entityIn) {
|
||||
public IBakedModel func_239290_a_(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn) {
|
||||
boolean clip = ItemManaGun.hasClip(stack);
|
||||
|
||||
if (ItemManaGun.isSugoiKawaiiDesuNe(stack)) {
|
||||
|
||||
@@ -12,9 +12,9 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.Model;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
|
||||
public class ModelBellows extends Model {
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.Model;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.block.tile.TileBrewery;
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.Model;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
|
||||
public class ModelHourglass extends Model {
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ public class ManaInfusionProcessor implements IComponentProcessor {
|
||||
return I18n.format("botaniamisc.drop") + TextFormatting.BOLD + " (?)";
|
||||
case "dropTip0":
|
||||
case "dropTip1": {
|
||||
String drop = new KeybindTextComponent("key.drop").applyTextStyle(TextFormatting.GREEN).getFormattedText();
|
||||
String drop = new KeybindTextComponent("key.drop").func_240699_a_(TextFormatting.GREEN).getFormattedText();
|
||||
return I18n.format("botaniamisc.dropTip" + key.substring(7), drop);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,8 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
@@ -23,6 +21,8 @@ import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.common.entity.EntityBabylonWeapon;
|
||||
@@ -57,7 +57,7 @@ public class RenderBabylonWeapon extends EntityRenderer<EntityBabylonWeapon> {
|
||||
// GlStateManager.color4f(1F, 1F, 1F, chargeMul);
|
||||
|
||||
IBakedModel model = MiscellaneousIcons.INSTANCE.kingKeyWeaponModels[weapon.getVariety()];
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentCullBlockType()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY);
|
||||
ms.pop();
|
||||
|
||||
Random rand = new Random(weapon.getUniqueID().getMostSignificantBits());
|
||||
|
||||
@@ -12,11 +12,11 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.common.entity.EntityCorporeaSpark;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.client.render.entity;
|
||||
|
||||
import net.minecraft.client.renderer.culling.ClippingHelperImpl;
|
||||
import net.minecraft.client.renderer.culling.ClippingHelper;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
@@ -23,7 +23,7 @@ public class RenderNoop<T extends Entity> extends EntityRenderer<T> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldRender(T entity, @Nonnull ClippingHelperImpl clipping, double x, double y, double z) {
|
||||
public boolean shouldRender(T entity, @Nonnull ClippingHelper clipping, double x, double y, double z) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,14 +12,14 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
|
||||
@@ -16,6 +16,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
|
||||
import net.minecraft.util.math.vector.Matrix3f;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
@@ -55,7 +58,7 @@ public class RenderTileAlfPortal extends TileEntityRenderer<TileAlfPortal> {
|
||||
}
|
||||
|
||||
public void renderIcon(MatrixStack ms, IRenderTypeBuffer buffers, TextureAtlasSprite icon, int x, int y, int width, int height, float alpha, int overlay) {
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType());
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentCullBlockType());
|
||||
Matrix4f model = ms.getLast().getMatrix();
|
||||
Matrix3f normal = ms.getLast().getNormal();
|
||||
buffer.pos(model, x, y + height, 0).color(1, 1, 1, alpha).tex(icon.getMinU(), icon.getMaxV()).overlay(overlay).lightmap(0xF000F0).normal(normal, 1, 0, 0).endVertex();
|
||||
|
||||
@@ -15,8 +15,6 @@ import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
@@ -24,6 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.common.block.tile.TileAltar;
|
||||
|
||||
@@ -115,7 +115,7 @@ public class RenderTileAltar extends TileEntityRenderer<TileAltar> {
|
||||
: Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.WATER.getDefaultState()).getParticleTexture();
|
||||
int color = lava ? Fluids.LAVA.getAttributes().getColor(altar.getWorld(), altar.getPos())
|
||||
: Fluids.WATER.getAttributes().getColor(altar.getWorld(), altar.getPos());
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType());
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentCullBlockType());
|
||||
renderIcon(ms, buffer, sprite, color, alpha, overlay, lava ? 0xF000F0 : light);
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
@@ -13,12 +13,12 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.common.block.tile.TileAnimatedTorch;
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
@@ -23,6 +22,7 @@ import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.api.item.IAvatarWieldable;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
|
||||
@@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelBellows;
|
||||
import vazkii.botania.common.block.tile.mana.TileBellows;
|
||||
|
||||
@@ -15,11 +15,11 @@ import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderTypeLookup;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.common.block.tile.TileCocoon;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@@ -15,7 +15,6 @@ import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.entity.ItemRenderer;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
@@ -24,6 +23,7 @@ import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
|
||||
|
||||
@@ -83,7 +83,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer<TileCorpor
|
||||
if (cubeModel != null) {
|
||||
ms.push();
|
||||
ms.translate(-0.5F, 0.25F, -0.5F);
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType());
|
||||
IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentCullBlockType());
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, null, cubeModel, 1, 1, 1, light, overlay);
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
@@ -12,14 +12,14 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Quaternion;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Quaternion;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
|
||||
|
||||
@@ -13,11 +13,11 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
|
||||
@@ -15,11 +15,11 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.BlockRendererDispatcher;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderTypeLookup;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraftforge.client.model.data.IModelData;
|
||||
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
@@ -65,7 +65,7 @@ public class RenderTileFloatingFlower extends TileEntityRenderer<TileEntity> {
|
||||
BlockState state = tile.getBlockState();
|
||||
|
||||
IBakedModel ibakedmodel = brd.getModelForState(state);
|
||||
brd.getBlockModelRenderer().renderModel(ms.getLast(), buffers.getBuffer(RenderTypeLookup.getRenderType(state)), state, ibakedmodel, 1, 1, 1, light, overlay, data);
|
||||
brd.getBlockModelRenderer().renderModel(ms.getLast(), buffers.getBuffer(RenderTypeLookup.func_239220_a_(state, false)), state, ibakedmodel, 1, 1, 1, light, overlay, data);
|
||||
|
||||
ms.pop();
|
||||
|
||||
|
||||
@@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelHourglass;
|
||||
|
||||
@@ -13,7 +13,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
@@ -21,6 +20,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.util.Direction;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.common.block.tile.TileIncensePlate;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@@ -14,12 +14,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
|
||||
@@ -16,13 +16,13 @@ import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderTypeLookup;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.api.mana.IPoolOverlayProvider;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
|
||||
@@ -12,13 +12,13 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.AtlasTexture;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.common.block.tile.mana.TilePrism;
|
||||
|
||||
@@ -14,12 +14,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.common.block.tile.mana.TilePump;
|
||||
|
||||
public class RenderTilePump extends TileEntityRenderer<TilePump> {
|
||||
|
||||
@@ -14,7 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
@@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.LazyValue;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
@@ -136,7 +137,7 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
|
||||
private static final LazyValue<TilePylon> DUMMY = new LazyValue<>(TilePylon::new);
|
||||
|
||||
@Override
|
||||
public void render(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
public void func_239207_a_(ItemStack stack, ItemCameraTransforms.TransformType type, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
if (Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) {
|
||||
RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant;
|
||||
TileEntityRenderer<TilePylon> r = TileEntityRendererDispatcher.instance.getRenderer(DUMMY.getValue());
|
||||
|
||||
@@ -13,13 +13,13 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.helper.RenderHelper;
|
||||
import vazkii.botania.common.block.tile.TileRuneAltar;
|
||||
|
||||
@@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.common.block.tile.TileSparkChanger;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@@ -14,9 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Quaternion;
|
||||
import net.minecraft.client.renderer.RenderTypeLookup;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
@@ -24,6 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
|
||||
import net.minecraft.util.math.vector.Quaternion;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.common.block.mana.BlockSpreader;
|
||||
|
||||
@@ -12,7 +12,6 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Matrix4f;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.tileentity.EndPortalTileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
@@ -20,6 +19,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Util;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
|
||||
import vazkii.botania.common.block.tile.TileStarfield;
|
||||
|
||||
@@ -12,10 +12,10 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
|
||||
@@ -12,11 +12,11 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.client.lib.LibResources;
|
||||
import vazkii.botania.client.model.ModelTeruTeruBozu;
|
||||
|
||||
@@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.RenderType;
|
||||
import net.minecraft.client.renderer.Vector3f;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.model.ModelRenderer;
|
||||
@@ -32,6 +31,7 @@ import net.minecraft.util.Direction.Axis;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
@@ -380,7 +380,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
}
|
||||
|
||||
private void renderModel(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, IBakedModel model) {
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, model, 1, 1, 1, light, overlay);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentCullBlockType()), null, model, 1, 1, 1, light, overlay);
|
||||
}
|
||||
|
||||
private void renderItem(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, ItemStack stack) {
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -34,7 +35,7 @@ public class TEISR extends ItemStackTileEntityRenderer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
public void func_239207_a_(ItemStack stack, ItemCameraTransforms.TransformType transform, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
|
||||
if (stack.getItem() == block.asItem()) {
|
||||
TileEntityRendererDispatcher.instance.getRenderer(dummy.getValue())
|
||||
.render(null, 0, ms, buffers, light, overlay);
|
||||
|
||||
@@ -20,7 +20,9 @@ import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.client.world.ClientWorld;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Matrix4f;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3f;
|
||||
import net.minecraftforge.client.SkyRenderHandler;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -13,9 +13,12 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.inventory.container.ContainerType;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.crafting.IRecipeSerializer;
|
||||
import net.minecraft.loot.conditions.LootConditionManager;
|
||||
import net.minecraft.loot.functions.LootFunctionManager;
|
||||
import net.minecraft.particles.ParticleType;
|
||||
import net.minecraft.potion.Effect;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -23,10 +26,7 @@ import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.SoundEvent;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.world.gen.ChunkGeneratorType;
|
||||
import net.minecraft.world.gen.feature.Feature;
|
||||
import net.minecraft.world.storage.loot.conditions.LootConditionManager;
|
||||
import net.minecraft.world.storage.loot.functions.LootFunctionManager;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.capabilities.CapabilityManager;
|
||||
import net.minecraftforge.common.loot.GlobalLootModifierSerializer;
|
||||
@@ -157,6 +157,7 @@ public class Botania {
|
||||
modBus.addGenericListener(Item.class, ModSubtiles::registerItemBlocks);
|
||||
modBus.addGenericListener(TileEntityType.class, ModSubtiles::registerTEs);
|
||||
modBus.addGenericListener(GlobalLootModifierSerializer.class, DisposeModifier::register);
|
||||
modBus.addGenericListener(Attribute.class, PixieHandler::registerAttribute);
|
||||
|
||||
IEventBus forgeBus = MinecraftForge.EVENT_BUS;
|
||||
forgeBus.addListener(this::serverAboutToStart);
|
||||
@@ -172,7 +173,7 @@ public class Botania {
|
||||
forgeBus.addListener(ItemVirus::onLivingHurt);
|
||||
forgeBus.addListener(SleepingHandler::trySleep);
|
||||
forgeBus.addListener(PixieHandler::onDamageTaken);
|
||||
forgeBus.addGenericListener(Entity.class, PixieHandler::registerAttribute);
|
||||
forgeBus.addGenericListener(Entity.class, PixieHandler::attachAttribute);
|
||||
forgeBus.addGenericListener(TileEntity.class, ExoflameFurnaceHandler::attachFurnaceCapability);
|
||||
forgeBus.addListener(CommonTickHandler::onTick);
|
||||
forgeBus.addListener(PotionBloodthirst::onSpawn);
|
||||
@@ -281,10 +282,6 @@ public class Botania {
|
||||
);
|
||||
PatchouliAPI.instance.registerMultiblock(new ResourceLocation(LibMisc.MOD_ID, "gaia_ritual"), mb);
|
||||
|
||||
LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer());
|
||||
LootConditionManager.registerCondition(new EnableRelics.Serializer());
|
||||
LootFunctionManager.registerFunction(new BindUuid.Serializer());
|
||||
|
||||
CriteriaTriggers.register(AlfPortalTrigger.INSTANCE);
|
||||
CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE);
|
||||
CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE);
|
||||
|
||||
@@ -57,10 +57,4 @@ public class BlockAlfPortal extends BlockMod implements ITileEntityProvider, IWa
|
||||
}
|
||||
return did;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightValue(@Nonnull BlockState state) {
|
||||
return state.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : super.getLightValue(state);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -87,7 +87,7 @@ public class BlockAltGrass extends BlockMod {
|
||||
@Override
|
||||
public boolean canSustainPlant(@Nonnull BlockState state, @Nonnull IBlockReader world, BlockPos pos, @Nonnull Direction direction, IPlantable plantable) {
|
||||
PlantType type = plantable.getPlantType(world, pos.down());
|
||||
return type == PlantType.Plains || type == PlantType.Beach || plantable instanceof StemBlock;
|
||||
return type == PlantType.PLAINS || type == PlantType.BEACH || plantable instanceof StemBlock;
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
|
||||
@@ -131,7 +131,7 @@ public class BlockAnimatedTorch extends BlockModWaterloggable implements ITileEn
|
||||
@Override
|
||||
public void onPlayerDestroy(IWorld world, BlockPos pos, BlockState state) {
|
||||
// TE is already gone so best we can do is just notify everyone
|
||||
world.notifyNeighbors(pos, this);
|
||||
world.func_230547_a_(pos, this);
|
||||
super.onPlayerDestroy(world, pos, state);
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ public class BlockBifrostPerm extends BlockModGlass {
|
||||
|
||||
@Override
|
||||
public float[] getBeaconColorMultiplier(BlockState state, IWorldReader world, BlockPos pos, BlockPos beaconPos) {
|
||||
int rgb = MathHelper.hsvToRGB(world.getDimension().getWorld().getGameTime() * 5 % 360 / 360F, 0.4F, 0.9F);
|
||||
int rgb = MathHelper.hsvToRGB(((World) world).getGameTime() * 5 % 360 / 360F, 0.4F, 0.9F);
|
||||
float[] ret = new float[3];
|
||||
ret[0] = ((rgb >> 16) & 0xFF) / 255.0F;
|
||||
ret[1] = ((rgb >> 8) & 0xFF) / 255.0F;
|
||||
|
||||
@@ -25,7 +25,7 @@ public class BlockEnchantedSoil extends BlockMod {
|
||||
|
||||
@Override
|
||||
public boolean canSustainPlant(@Nonnull BlockState state, @Nonnull IBlockReader world, BlockPos pos, @Nonnull Direction direction, IPlantable plantable) {
|
||||
return plantable.getPlantType(world, pos.down()) == PlantType.Plains;
|
||||
return plantable.getPlantType(world, pos.down()) == PlantType.PLAINS;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -31,7 +31,7 @@ public class BlockFakeAir extends AirBlock implements ITileEntityProvider {
|
||||
@Override
|
||||
public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) {
|
||||
if (shouldRemove(world, pos)) {
|
||||
world.getPendingBlockTicks().scheduleTick(pos, this, tickRate(world));
|
||||
world.getPendingBlockTicks().scheduleTick(pos, this, 4);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,11 +46,6 @@ public class BlockFakeAir extends AirBlock implements ITileEntityProvider {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int tickRate(IWorldReader world) {
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(@Nonnull IBlockReader world) {
|
||||
|
||||
@@ -14,6 +14,8 @@ import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.LootContext;
|
||||
import net.minecraft.loot.LootParameters;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
@@ -22,8 +24,6 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.storage.loot.LootContext;
|
||||
import net.minecraft.world.storage.loot.LootParameters;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
|
||||
@@ -14,14 +14,14 @@ import net.minecraft.block.AbstractRailBlock;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.entity.item.minecart.AbstractMinecartEntity;
|
||||
import net.minecraft.state.IProperty;
|
||||
import net.minecraft.state.Property;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
import net.minecraft.state.properties.RailShape;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.util.RegistryKey;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.dimension.DimensionType;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
||||
@@ -51,12 +51,12 @@ public class BlockGhostRail extends AbstractRailBlock {
|
||||
int floatTicks = cart.getPersistentData().getInt(TAG_FLOAT_TICKS);
|
||||
Preconditions.checkState(floatTicks > 0);
|
||||
|
||||
BlockPos entPos = new BlockPos(cart);
|
||||
BlockPos entPos = cart.func_233580_cy_();
|
||||
BlockState state = cart.world.getBlockState(entPos);
|
||||
boolean air = state.isAir(cart.world, entPos);
|
||||
|
||||
if (state.getBlock() == ModBlocks.dreamwood
|
||||
|| (state.getBlock() != ModBlocks.ghostRail && state.isIn(BlockTags.RAILS))) {
|
||||
|| (state.getBlock() != ModBlocks.ghostRail && state.func_235714_a_(BlockTags.RAILS))) {
|
||||
cart.world.playEvent(2003, entPos, 0);
|
||||
cart.getPersistentData().putInt(TAG_FLOAT_TICKS, 0);
|
||||
} else {
|
||||
@@ -84,11 +84,11 @@ public class BlockGhostRail extends AbstractRailBlock {
|
||||
}
|
||||
}
|
||||
|
||||
private final Map<DimensionType, Set<AbstractMinecartEntity>> floatingCarts = new HashMap<>();
|
||||
private final Map<RegistryKey<World>, Set<AbstractMinecartEntity>> floatingCarts = new HashMap<>();
|
||||
|
||||
private void addFloatingCart(AbstractMinecartEntity cart) {
|
||||
if (cart.isAlive() && cart.getPersistentData().getInt(TAG_FLOAT_TICKS) > 0) {
|
||||
floatingCarts.computeIfAbsent(cart.world.getDimension().getType(), t -> Collections.newSetFromMap(new WeakHashMap<>()))
|
||||
floatingCarts.computeIfAbsent(cart.world.func_234923_W_(), t -> Collections.newSetFromMap(new WeakHashMap<>()))
|
||||
.add(cart);
|
||||
}
|
||||
}
|
||||
@@ -102,10 +102,10 @@ public class BlockGhostRail extends AbstractRailBlock {
|
||||
private void worldTick(TickEvent.WorldTickEvent evt) {
|
||||
if (!evt.world.isRemote() && evt.phase == TickEvent.Phase.END) {
|
||||
evt.world.getProfiler().startSection("cartFloatingIter");
|
||||
Iterator<AbstractMinecartEntity> iter = floatingCarts.getOrDefault(evt.world.getDimension().getType(), Collections.emptySet()).iterator();
|
||||
Iterator<AbstractMinecartEntity> iter = floatingCarts.getOrDefault(evt.world.func_234923_W_(), Collections.emptySet()).iterator();
|
||||
while (iter.hasNext()) {
|
||||
AbstractMinecartEntity c = iter.next();
|
||||
BlockPos entPos = new BlockPos(c);
|
||||
BlockPos entPos = c.func_233580_cy_();
|
||||
|
||||
if (!c.isAlive() || !c.isAddedToWorld() || !c.world.isBlockLoaded(entPos)
|
||||
|| c.getPersistentData().getInt(TAG_FLOAT_TICKS) <= 0) {
|
||||
@@ -127,7 +127,7 @@ public class BlockGhostRail extends AbstractRailBlock {
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public IProperty<RailShape> getShapeProperty() {
|
||||
public Property<RailShape> getShapeProperty() {
|
||||
return BlockStateProperties.RAIL_SHAPE_STRAIGHT;
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.Util;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
@@ -80,7 +81,7 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge
|
||||
|
||||
if (hourglass.lock) {
|
||||
if (!player.world.isRemote) {
|
||||
player.sendMessage(new TranslationTextComponent("botaniamisc.hourglassLock"));
|
||||
player.sendMessage(new TranslationTextComponent("botaniamisc.hourglassLock"), Util.field_240973_b_);
|
||||
}
|
||||
return ActionResultType.FAIL;
|
||||
}
|
||||
@@ -108,11 +109,6 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge
|
||||
return state.get(BlockStateProperties.POWERED) ? 15 : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int tickRate(IWorldReader world) {
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) {
|
||||
if (state.get(BlockStateProperties.POWERED)) {
|
||||
|
||||
@@ -66,11 +66,6 @@ public class BlockLightRelay extends BlockModWaterloggable implements ITileEntit
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int tickRate(IWorldReader world) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) {
|
||||
if (!worldIn.isRemote && variant == LuminizerVariant.TOGGLE) {
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.potion.Effect;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
|
||||
@@ -11,8 +11,8 @@ package vazkii.botania.common.block;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.IWaterLoggable;
|
||||
import net.minecraft.fluid.FluidState;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.fluid.IFluidState;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
@@ -37,14 +37,14 @@ public abstract class BlockModWaterloggable extends BlockMod implements IWaterLo
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFluidState getFluidState(BlockState state) {
|
||||
public FluidState getFluidState(BlockState state) {
|
||||
return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : Fluids.EMPTY.getDefaultState();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
IFluidState fluidState = context.getWorld().getFluidState(context.getPos());
|
||||
FluidState fluidState = context.getWorld().getFluidState(context.getPos());
|
||||
return this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import com.mojang.datafixers.Dynamic;
|
||||
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.MovingPistonBlock;
|
||||
@@ -28,12 +26,12 @@ import net.minecraft.state.properties.PistonType;
|
||||
import net.minecraft.tileentity.PistonTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.RegistryKey;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.GlobalPos;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.dimension.DimensionType;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraft.world.storage.WorldSavedData;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
@@ -74,12 +72,12 @@ public class BlockPistonRelay extends BlockMod implements IWandable {
|
||||
@Override
|
||||
public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) {
|
||||
if (!world.isRemote) {
|
||||
mapCoords(world.getDimension().getType(), pos, 2);
|
||||
mapCoords(world.func_234923_W_(), pos, 2);
|
||||
}
|
||||
}
|
||||
|
||||
private void mapCoords(DimensionType type, BlockPos pos, int time) {
|
||||
coordsToCheck.put(GlobalPos.of(type, pos), time);
|
||||
private void mapCoords(RegistryKey<World> type, BlockPos pos, int time) {
|
||||
coordsToCheck.put(GlobalPos.func_239648_a_(type, pos), time);
|
||||
}
|
||||
|
||||
private void decrCoords(GlobalPos key) {
|
||||
@@ -101,7 +99,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable {
|
||||
if (server == null) {
|
||||
return null;
|
||||
}
|
||||
return server.getWorld(key.getDimension()).getTileEntity(key.getPos());
|
||||
return server.getWorld(key.func_239646_a_()).getTileEntity(key.getPos());
|
||||
}
|
||||
|
||||
private BlockState getStateAt(GlobalPos key) {
|
||||
@@ -109,7 +107,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable {
|
||||
if (server == null) {
|
||||
return Blocks.AIR.getDefaultState();
|
||||
}
|
||||
return server.getWorld(key.getDimension()).getBlockState(key.getPos());
|
||||
return server.getWorld(key.func_239646_a_()).getBlockState(key.getPos());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -122,7 +120,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable {
|
||||
spawnAsEntity(world, pos, new ItemStack(this));
|
||||
world.destroyBlock(pos, false);
|
||||
} else {
|
||||
GlobalPos clicked = GlobalPos.of(world.getDimension().getType(), pos.toImmutable());
|
||||
GlobalPos clicked = GlobalPos.func_239648_a_(world.func_234923_W_(), pos.toImmutable());
|
||||
if (ItemTwigWand.getBindMode(stack)) {
|
||||
activeBindingAttempts.put(player.getUniqueID(), clicked);
|
||||
world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 0.5F, 1F);
|
||||
@@ -191,7 +189,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable {
|
||||
if (event.type == TickEvent.Type.SERVER && event.phase == TickEvent.Phase.END) {
|
||||
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
|
||||
for (GlobalPos s : coordsToCheck.keySet()) {
|
||||
ServerWorld world = server.getWorld(s.getDimension());
|
||||
ServerWorld world = server.getWorld(s.func_239646_a_());
|
||||
WorldData data = WorldData.get(world);
|
||||
|
||||
decrCoords(s);
|
||||
|
||||
@@ -34,11 +34,6 @@ public class BlockSolidVines extends VineBlock {
|
||||
@Override
|
||||
public void tick(@Nonnull BlockState state, ServerWorld world, @Nonnull BlockPos pos, @Nonnull Random rand) {}
|
||||
|
||||
@Override
|
||||
public boolean isShearable(ItemStack item, IWorldReader world, BlockPos pos) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ItemStack getItem(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state) {
|
||||
|
||||
@@ -16,6 +16,8 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.LootContext;
|
||||
import net.minecraft.loot.LootParameters;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
@@ -23,13 +25,11 @@ import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.storage.loot.LootContext;
|
||||
import net.minecraft.world.storage.loot.LootParameters;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ public final class ModBanners {
|
||||
private static void addPattern(String name, String id, IItemProvider craftingItem) {
|
||||
name = "botania_" + name;
|
||||
id = "bt_" + id;
|
||||
BannerPattern pattern = BannerPattern.create(name.toUpperCase(Locale.ROOT), name, id, new ItemStack(craftingItem));
|
||||
BannerPattern pattern = BannerPattern.create(name.toUpperCase(Locale.ROOT), name, id, false);
|
||||
PATTERNS.put(craftingItem.asItem().delegate, pattern);
|
||||
}
|
||||
}
|
||||
@@ -8,11 +8,9 @@
|
||||
*/
|
||||
package vazkii.botania.common.block;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.DispenserBlock;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -26,6 +24,8 @@ import net.minecraftforge.fml.DistExecutor;
|
||||
import net.minecraftforge.registries.IForgeRegistry;
|
||||
import net.minecraftforge.registries.IForgeRegistryEntry;
|
||||
|
||||
import vazkii.botania.api.state.BotaniaStateProps;
|
||||
import vazkii.botania.api.state.enums.AlfPortalState;
|
||||
import vazkii.botania.api.state.enums.LuminizerVariant;
|
||||
import vazkii.botania.client.render.tile.RenderTilePylon;
|
||||
import vazkii.botania.client.render.tile.TEISR;
|
||||
@@ -88,12 +88,13 @@ public final class ModBlocks {
|
||||
public static Block livingwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood));
|
||||
public static Block livingwoodFramed = new BlockMod(Block.Properties.from(livingwood));
|
||||
public static Block livingwoodPatternFramed = new BlockMod(Block.Properties.from(livingwood));
|
||||
public static Block livingwoodGlimmering = new BlockMod(Block.Properties.from(livingwood).lightValue(12));
|
||||
public static Block livingwoodGlimmering = new BlockMod(Block.Properties.from(livingwood).func_235838_a_(s -> 12));
|
||||
|
||||
public static Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA, Block.Properties.from(livingwood));
|
||||
public static Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE, Block.Properties.from(livingwood));
|
||||
public static Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN, Block.Properties.from(livingwood));
|
||||
public static Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA, Block.Properties.from(livingwood));
|
||||
private static final AbstractBlock.IExtendedPositionPredicate<EntityType<?>> NO_SPAWN = (state, world, pos, et) -> false;
|
||||
public static Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN));
|
||||
public static Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN));
|
||||
public static Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN));
|
||||
public static Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN));
|
||||
|
||||
public static Block manaPool = new BlockPool(BlockPool.Variant.DEFAULT, Block.Properties.from(livingrock));
|
||||
public static Block creativePool = new BlockPool(BlockPool.Variant.CREATIVE, Block.Properties.from(livingrock));
|
||||
@@ -101,7 +102,7 @@ public final class ModBlocks {
|
||||
public static Block fabulousPool = new BlockPool(BlockPool.Variant.FABULOUS, Block.Properties.from(livingrock));
|
||||
|
||||
public static Block runeAltar = new BlockRuneAltar(Block.Properties.from(livingrock));
|
||||
public static Block manaPylon = new BlockPylon(BlockPylon.Variant.MANA, Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7));
|
||||
public static Block manaPylon = new BlockPylon(BlockPylon.Variant.MANA, Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).func_235838_a_(s -> 7));
|
||||
public static Block naturaPylon = new BlockPylon(BlockPylon.Variant.NATURA, Block.Properties.from(manaPylon));
|
||||
public static Block gaiaPylon = new BlockPylon(BlockPylon.Variant.GAIA, Block.Properties.from(manaPylon));
|
||||
|
||||
@@ -109,7 +110,7 @@ public final class ModBlocks {
|
||||
public static Block distributor = new BlockDistributor(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE));
|
||||
public static Block manaVoid = new BlockManaVoid(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE));
|
||||
public static Block manaDetector = new BlockManaDetector(Block.Properties.from(livingrock));
|
||||
public static Block enchanter = new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE));
|
||||
public static Block enchanter = new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).func_235838_a_(s -> 15).sound(SoundType.STONE));
|
||||
public static Block turntable = new BlockTurntable(Block.Properties.from(livingwood));
|
||||
public static Block tinyPlanet = new BlockTinyPlanet(Block.Properties.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE));
|
||||
public static Block alchemyCatalyst = new BlockAlchemyCatalyst(Block.Properties.from(livingrock));
|
||||
@@ -125,7 +126,7 @@ public final class ModBlocks {
|
||||
public static Block gatheringDrum = new BlockForestDrum(BlockForestDrum.Variant.GATHERING, Block.Properties.from(livingwood));
|
||||
public static Block canopyDrum = new BlockForestDrum(BlockForestDrum.Variant.CANOPY, Block.Properties.from(livingwood));
|
||||
|
||||
public static Block whiteShinyFlower = new BlockShinyFlower(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(15));
|
||||
public static Block whiteShinyFlower = new BlockShinyFlower(DyeColor.WHITE, Block.Properties.from(whiteFlower).func_235838_a_(s -> 15));
|
||||
public static Block orangeShinyFlower = new BlockShinyFlower(DyeColor.ORANGE, Block.Properties.from(whiteShinyFlower));
|
||||
public static Block magentaShinyFlower = new BlockShinyFlower(DyeColor.MAGENTA, Block.Properties.from(whiteShinyFlower));
|
||||
public static Block lightBlueShinyFlower = new BlockShinyFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteShinyFlower));
|
||||
@@ -145,7 +146,8 @@ public final class ModBlocks {
|
||||
public static Block abstrusePlatform = new BlockPlatform(BlockPlatform.Variant.ABSTRUSE, Block.Properties.create(Material.WOOD).hardnessAndResistance(2, 5).sound(SoundType.WOOD));
|
||||
public static Block spectralPlatform = new BlockPlatform(BlockPlatform.Variant.SPECTRAL, Block.Properties.from(abstrusePlatform));
|
||||
public static Block infrangiblePlatform = new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE, Block.Properties.create(Material.WOOD).hardnessAndResistance(-1, Float.MAX_VALUE).sound(SoundType.WOOD));
|
||||
public static Block alfPortal = new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD));
|
||||
public static Block alfPortal = new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD)
|
||||
.func_235838_a_(s -> s.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0));
|
||||
public static Block dreamwood = new BlockMod(Block.Properties.from(livingwood));
|
||||
public static Block dreamwoodPlanks = new BlockMod(Block.Properties.from(livingwood));
|
||||
public static Block dreamwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood));
|
||||
@@ -153,10 +155,10 @@ public final class ModBlocks {
|
||||
public static Block dreamwoodPatternFramed = new BlockMod(Block.Properties.from(livingwood));
|
||||
public static Block dreamwoodGlimmering = new BlockMod(Block.Properties.from(livingwoodGlimmering));
|
||||
public static Block conjurationCatalyst = new BlockConjurationCatalyst(Block.Properties.from(livingrock));
|
||||
public static Block bifrost = new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS).notSolid());
|
||||
public static Block bifrost = new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).func_235838_a_(s -> 15).sound(SoundType.GLASS).notSolid());
|
||||
public static Block solidVines = new BlockSolidVines(Block.Properties.create(Material.TALL_PLANTS).hardnessAndResistance(0.2F).sound(SoundType.PLANT).notSolid());
|
||||
|
||||
public static Block whiteBuriedPetals = new BlockBuriedPetals(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(4));
|
||||
public static Block whiteBuriedPetals = new BlockBuriedPetals(DyeColor.WHITE, Block.Properties.from(whiteFlower).func_235838_a_(s -> 4));
|
||||
public static Block orangeBuriedPetals = new BlockBuriedPetals(DyeColor.ORANGE, Block.Properties.from(whiteBuriedPetals));
|
||||
public static Block magentaBuriedPetals = new BlockBuriedPetals(DyeColor.MAGENTA, Block.Properties.from(whiteBuriedPetals));
|
||||
public static Block lightBlueBuriedPetals = new BlockBuriedPetals(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteBuriedPetals));
|
||||
@@ -173,7 +175,7 @@ public final class ModBlocks {
|
||||
public static Block redBuriedPetals = new BlockBuriedPetals(DyeColor.RED, Block.Properties.from(whiteBuriedPetals));
|
||||
public static Block blackBuriedPetals = new BlockBuriedPetals(DyeColor.BLACK, Block.Properties.from(whiteBuriedPetals));
|
||||
|
||||
public static Block whiteFloatingFlower = new BlockFloatingFlower(DyeColor.WHITE, Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15));
|
||||
public static Block whiteFloatingFlower = new BlockFloatingFlower(DyeColor.WHITE, Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).func_235838_a_(s -> 15));
|
||||
public static Block orangeFloatingFlower = new BlockFloatingFlower(DyeColor.ORANGE, Block.Properties.from(whiteFloatingFlower));
|
||||
public static Block magentaFloatingFlower = new BlockFloatingFlower(DyeColor.MAGENTA, Block.Properties.from(whiteFloatingFlower));
|
||||
public static Block lightBlueFloatingFlower = new BlockFloatingFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteFloatingFlower));
|
||||
@@ -212,7 +214,7 @@ public final class ModBlocks {
|
||||
public static Block enderEye = new BlockEnderEye(Block.Properties.from(manasteelBlock));
|
||||
public static Block starfield = new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL));
|
||||
public static Block rfGenerator = new BlockRFGenerator(Block.Properties.from(livingrock));
|
||||
public static Block elfGlass = new BlockElfGlass(Block.Properties.from(Blocks.GLASS).lightValue(15));
|
||||
public static Block elfGlass = new BlockElfGlass(Block.Properties.from(Blocks.GLASS).func_235838_a_(s -> 15));
|
||||
public static Block brewery = new BlockBrewery(Block.Properties.from(livingrock));
|
||||
public static Block manaGlass = new BlockModGlass(Block.Properties.from(elfGlass));
|
||||
public static Block terraPlate = new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL));
|
||||
@@ -222,7 +224,7 @@ public final class ModBlocks {
|
||||
public static Block redStringComparator = new BlockRedStringComparator(Block.Properties.from(livingrock));
|
||||
public static Block redStringRelay = new BlockRedStringRelay(Block.Properties.from(livingrock));
|
||||
public static Block redStringInterceptor = new BlockRedStringInterceptor(Block.Properties.from(livingrock));
|
||||
public static Block manaFlame = new BlockManaFlame(Block.Properties.create(Material.WOOL).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement());
|
||||
public static Block manaFlame = new BlockManaFlame(Block.Properties.create(Material.WOOL).sound(SoundType.CLOTH).func_235838_a_(s -> 15).doesNotBlockMovement());
|
||||
public static Block prism = new BlockPrism(Block.Properties.from(elfGlass).doesNotBlockMovement());
|
||||
public static Block enchantedSoil = new BlockEnchantedSoil(Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).sound(SoundType.PLANT));
|
||||
|
||||
@@ -246,7 +248,7 @@ public final class ModBlocks {
|
||||
public static Block corporeaIndex = new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).notSolid());
|
||||
public static Block corporeaFunnel = new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL));
|
||||
|
||||
public static Block whiteMushroom = new BlockModMushroom(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(3));
|
||||
public static Block whiteMushroom = new BlockModMushroom(DyeColor.WHITE, Block.Properties.from(whiteFlower).func_235838_a_(s -> 3));
|
||||
public static Block orangeMushroom = new BlockModMushroom(DyeColor.ORANGE, Block.Properties.from(whiteMushroom));
|
||||
public static Block magentaMushroom = new BlockModMushroom(DyeColor.MAGENTA, Block.Properties.from(whiteMushroom));
|
||||
public static Block lightBlueMushroom = new BlockModMushroom(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteMushroom));
|
||||
@@ -283,7 +285,7 @@ public final class ModBlocks {
|
||||
public static Block doubleFlowerBlack = new BlockModDoubleFlower(DyeColor.BLACK, Block.Properties.from(doubleFlowerWhite));
|
||||
|
||||
public static Block fakeAir = new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).tickRandomly());
|
||||
public static Block blazeBlock = new BlockMod(Block.Properties.from(manasteelBlock).lightValue(15));
|
||||
public static Block blazeBlock = new BlockMod(Block.Properties.from(manasteelBlock).func_235838_a_(s -> 15));
|
||||
public static Block corporeaInterceptor = new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL));
|
||||
public static Block corporeaCrystalCube = new BlockCorporeaCrystalCube(Block.Properties.from(corporeaInterceptor));
|
||||
public static Block incensePlate = new BlockIncensePlate(Block.Properties.from(livingwood));
|
||||
@@ -301,7 +303,7 @@ public final class ModBlocks {
|
||||
public static Block manaBomb = new BlockManaBomb(Block.Properties.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD));
|
||||
public static Block cacophonium = new BlockCacophonium(Block.Properties.create(Material.WOOD).hardnessAndResistance(0.8F));
|
||||
public static Block bellows = new BlockBellows(Block.Properties.from(livingwood));
|
||||
public static Block bifrostPerm = new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS).notSolid());
|
||||
public static Block bifrostPerm = new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).func_235838_a_(s -> 15).sound(SoundType.GLASS).notSolid());
|
||||
public static Block cellBlock = new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH));
|
||||
public static Block gaiaHeadWall = new BlockGaiaHeadWall(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1));
|
||||
public static Block gaiaHead = new BlockGaiaHead(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1));
|
||||
@@ -316,7 +318,7 @@ public final class ModBlocks {
|
||||
public static Block scorchedGrass = new BlockAltGrass(BlockAltGrass.Variant.SCORCHED, Block.Properties.from(dryGrass));
|
||||
public static Block infusedGrass = new BlockAltGrass(BlockAltGrass.Variant.INFUSED, Block.Properties.from(dryGrass));
|
||||
public static Block mutatedGrass = new BlockAltGrass(BlockAltGrass.Variant.MUTATED, Block.Properties.from(dryGrass));
|
||||
public static Block animatedTorch = new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).notSolid());
|
||||
public static Block animatedTorch = new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).func_235838_a_(s -> 7).notSolid());
|
||||
|
||||
public static void registerBlocks(RegistryEvent.Register<Block> evt) {
|
||||
IForgeRegistry<Block> r = evt.getRegistry();
|
||||
|
||||
@@ -39,7 +39,7 @@ import static vazkii.botania.common.block.ModBlocks.register;
|
||||
@ObjectHolder(LibMisc.MOD_ID)
|
||||
public class ModSubtiles {
|
||||
public static final Block pureDaisy = new BlockSpecialFlower(Block.Properties.from(Blocks.POPPY), SubTilePureDaisy::new);
|
||||
public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15), SubTilePureDaisy::new);
|
||||
public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).func_235838_a_(s -> 15), SubTilePureDaisy::new);
|
||||
|
||||
public static final Block manastar = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileManastar::new);
|
||||
public static final Block manastarFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileManastar::new);
|
||||
|
||||
+3
-3
@@ -11,8 +11,8 @@ package vazkii.botania.common.block.corporea;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.IWaterLoggable;
|
||||
import net.minecraft.fluid.FluidState;
|
||||
import net.minecraft.fluid.Fluids;
|
||||
import net.minecraft.fluid.IFluidState;
|
||||
import net.minecraft.item.BlockItemUseContext;
|
||||
import net.minecraft.state.StateContainer;
|
||||
import net.minecraft.state.properties.BlockStateProperties;
|
||||
@@ -37,14 +37,14 @@ public abstract class BlockCorporeaBaseWaterloggable extends BlockCorporeaBase i
|
||||
}
|
||||
|
||||
@Override
|
||||
public IFluidState getFluidState(BlockState state) {
|
||||
public FluidState getFluidState(BlockState state) {
|
||||
return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : Fluids.EMPTY.getDefaultState();
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public BlockState getStateForPlacement(BlockItemUseContext context) {
|
||||
IFluidState fluidState = context.getWorld().getFluidState(context.getPos());
|
||||
FluidState fluidState = context.getWorld().getFluidState(context.getPos());
|
||||
return this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
|
||||
}
|
||||
|
||||
|
||||
@@ -52,11 +52,6 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase {
|
||||
return state.get(BlockStateProperties.POWERED) ? 15 : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int tickRate(IWorldReader world) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TileCorporeaBase createNewTileEntity(@Nonnull IBlockReader world) {
|
||||
|
||||
@@ -56,7 +56,7 @@ public class BlockManaFlame extends BlockMod implements ITileEntityProvider {
|
||||
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
|
||||
if (Botania.gardenOfGlassLoaded) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if (!stack.isEmpty() && ItemTags.SAPLINGS.contains(stack.getItem()) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) {
|
||||
if (!stack.isEmpty() && ItemTags.SAPLINGS.func_230235_a_(stack.getItem()) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) {
|
||||
if (!world.isRemote) {
|
||||
stack.shrink(1);
|
||||
ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.lexicon));
|
||||
|
||||
@@ -10,17 +10,10 @@ package vazkii.botania.common.block.decor;
|
||||
|
||||
import net.minecraft.block.AbstractGlassBlock;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.fluid.IFluidState;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.ILightReader;
|
||||
|
||||
public class BlockModGlass extends AbstractGlassBlock {
|
||||
public BlockModGlass(Properties props) {
|
||||
super(props);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldDisplayFluidOverlay(BlockState state, ILightReader world, BlockPos pos, IFluidState fluidState) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ public class BehaviourFelPumpkin extends OptionalDispenseBehavior {
|
||||
World world = source.getWorld();
|
||||
BlockPos blockpos = source.getBlockPos().offset(source.getBlockState().get(DispenserBlock.FACING));
|
||||
Block blockcarvedpumpkin = ModBlocks.felPumpkin;
|
||||
this.successful = true;
|
||||
this.func_239796_a_(true);
|
||||
if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS
|
||||
&& world.getBlockState(blockpos.down(2)).getBlock() == Blocks.IRON_BARS) // Botania - Check for iron bars
|
||||
{
|
||||
|
||||
@@ -41,14 +41,14 @@ public class BehaviourPoolMinecart extends DefaultDispenseItemBehavior {
|
||||
BlockState iblockstate = world.getBlockState(blockpos);
|
||||
RailShape railshape = iblockstate.getBlock() instanceof AbstractRailBlock ? ((AbstractRailBlock) iblockstate.getBlock()).getRailDirection(iblockstate, world, blockpos, null) : RailShape.NORTH_SOUTH;
|
||||
double d3;
|
||||
if (iblockstate.isIn(BlockTags.RAILS)) {
|
||||
if (iblockstate.func_235714_a_(BlockTags.RAILS)) {
|
||||
if (railshape.isAscending()) {
|
||||
d3 = 0.6D;
|
||||
} else {
|
||||
d3 = 0.1D;
|
||||
}
|
||||
} else {
|
||||
if (!iblockstate.isAir() || !world.getBlockState(blockpos.down()).isIn(BlockTags.RAILS)) {
|
||||
if (!iblockstate.isAir() || !world.getBlockState(blockpos.down()).func_235714_a_(BlockTags.RAILS)) {
|
||||
return this.behaviourDefaultDispenseItem.dispense(source, stack);
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.entity.IShearable;
|
||||
import net.minecraft.entity.MobEntity;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.entity.passive.CowEntity;
|
||||
@@ -24,8 +25,8 @@ import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.IShearable;
|
||||
|
||||
import net.minecraftforge.common.IForgeShearable;
|
||||
import vazkii.botania.api.internal.IManaBurst;
|
||||
import vazkii.botania.api.mana.IManaTrigger;
|
||||
import vazkii.botania.common.block.BlockModWaterloggable;
|
||||
@@ -81,7 +82,8 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg
|
||||
ItemStack stack = new ItemStack(ModBlocks.gatheringDrum);
|
||||
|
||||
for (MobEntity entity : entities) {
|
||||
if (entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, new BlockPos(entity))) {
|
||||
if (entity instanceof IShearable && ((IShearable) entity).func_230262_K__()
|
||||
|| entity instanceof IForgeShearable && ((IForgeShearable) entity).isShearable(stack, world, entity.func_233580_cy_()) ) {
|
||||
shearables.add(entity);
|
||||
} else if (entity instanceof CowEntity) {
|
||||
List<ItemEntity> items = world.getEntitiesWithinAABB(ItemEntity.class, entity.getBoundingBox());
|
||||
@@ -111,15 +113,20 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg
|
||||
break;
|
||||
}
|
||||
|
||||
List<ItemStack> stacks = ((IShearable) entity).onSheared(stack, world, new BlockPos(entity), 0);
|
||||
for (ItemStack wool : stacks) {
|
||||
ItemEntity ent = entity.entityDropItem(wool, 1.0F);
|
||||
ent.setMotion(ent.getMotion().add(
|
||||
world.rand.nextFloat() * 0.05F,
|
||||
(world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F,
|
||||
(world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F
|
||||
));
|
||||
if (entity instanceof IShearable) {
|
||||
((IShearable) entity).func_230263_a_(SoundCategory.BLOCKS);
|
||||
} else {
|
||||
List<ItemStack> stacks = ((IForgeShearable) entity).onSheared(null, stack, world, entity.func_233580_cy_(), 0);
|
||||
for (ItemStack wool : stacks) {
|
||||
ItemEntity ent = entity.entityDropItem(wool, 1.0F);
|
||||
ent.setMotion(ent.getMotion().add(
|
||||
world.rand.nextFloat() * 0.05F,
|
||||
(world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F,
|
||||
(world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
++sheared;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.LootContext;
|
||||
import net.minecraft.loot.LootParameters;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -25,8 +27,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.storage.loot.LootContext;
|
||||
import net.minecraft.world.storage.loot.LootParameters;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
|
||||
@@ -90,11 +90,6 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP
|
||||
return RENDER_SHAPE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canEntitySpawn(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityType<?> type) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
|
||||
Direction orientation = placer == null ? Direction.WEST : Direction.getFacingDirections(placer)[0].getOpposite();
|
||||
|
||||
@@ -19,7 +19,7 @@ import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
|
||||
@@ -58,11 +58,6 @@ public class BlockRedStringInterceptor extends BlockRedString {
|
||||
world.setBlockState(pos, state.with(BlockStateProperties.POWERED, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int tickRate(IWorldReader world) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TileRedString createNewTileEntity(@Nonnull IBlockReader world) {
|
||||
|
||||
+3
-3
@@ -124,17 +124,17 @@ public class BergamuteEventHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getX() {
|
||||
public double getX() {
|
||||
return compose.getX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getY() {
|
||||
public double getY() {
|
||||
return compose.getY();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getZ() {
|
||||
public double getZ() {
|
||||
return compose.getZ();
|
||||
}
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ public class SubTileBergamute extends TileEntityFunctionalFlower {
|
||||
}
|
||||
|
||||
// todo seems expensive when we have lots of sounds cache maybe?
|
||||
protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) {
|
||||
protected static SubTileBergamute getBergamuteNearby(double x, double y, double z) {
|
||||
return existingFlowers.stream()
|
||||
.filter(f -> f.redstoneSignal == 0)
|
||||
.filter(f -> f.getEffectivePos().distanceSq(x, y, z, false) <= RANGE * RANGE)
|
||||
|
||||
+2
-2
@@ -13,7 +13,7 @@ import net.minecraft.potion.EffectInstance;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.world.dimension.EndDimension;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
|
||||
import vazkii.botania.api.subtile.RadiusDescriptor;
|
||||
@@ -35,7 +35,7 @@ public class SubTileFallenKanade extends TileEntityFunctionalFlower {
|
||||
public void tickFlower() {
|
||||
super.tickFlower();
|
||||
|
||||
if (!getWorld().isRemote && !(getWorld().getDimension() instanceof EndDimension)) {
|
||||
if (!getWorld().isRemote && getWorld().func_234923_W_() != World.field_234920_i_) {
|
||||
boolean did = false;
|
||||
List<PlayerEntity> players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
|
||||
for (PlayerEntity player : players) {
|
||||
|
||||
@@ -13,24 +13,24 @@ import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.SpawnReason;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.ai.attributes.Attributes;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.entity.monster.*;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.LootContext;
|
||||
import net.minecraft.loot.LootParameterSets;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.potion.EffectInstance;
|
||||
import net.minecraft.potion.Effects;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.world.Difficulty;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraft.world.storage.loot.LootContext;
|
||||
import net.minecraft.world.storage.loot.LootParameterSets;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
|
||||
@@ -76,7 +76,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower {
|
||||
Collections.shuffle(stacks);
|
||||
stack = stacks.get(0);
|
||||
}
|
||||
} while (stack.isEmpty() || ModTags.Items.LOONIUM_BLACKLIST.contains(stack.getItem()));
|
||||
} while (stack.isEmpty() || ModTags.Items.LOONIUM_BLACKLIST.func_230235_a_(stack.getItem()));
|
||||
|
||||
int bound = RANGE * 2 + 1;
|
||||
int xp = getEffectivePos().getX() - RANGE + rand.nextInt(bound);
|
||||
@@ -135,12 +135,8 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower {
|
||||
entity.setPositionAndRotation(x, y, z, world.rand.nextFloat() * 360F, 0);
|
||||
entity.setMotion(Vector3d.ZERO);
|
||||
|
||||
Multimap<String, AttributeModifier> map = HashMultimap.create();
|
||||
map.put(SharedMonsterAttributes.MAX_HEALTH.getName(),
|
||||
new AttributeModifier("Loonium Modififer Health", 2, AttributeModifier.Operation.MULTIPLY_BASE));
|
||||
map.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(),
|
||||
new AttributeModifier("Loonium Modififer Damage", 1.5, AttributeModifier.Operation.MULTIPLY_BASE));
|
||||
entity.getAttributes().applyAttributeModifiers(map);
|
||||
entity.getAttribute(Attributes.field_233818_a_).func_233769_c_(new AttributeModifier("Loonium Modififer Health", 2, AttributeModifier.Operation.MULTIPLY_BASE));
|
||||
entity.getAttribute(Attributes.field_233823_f_).func_233769_c_(new AttributeModifier("Loonium Modififer Damage", 1.5, AttributeModifier.Operation.MULTIPLY_BASE));
|
||||
|
||||
entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE,
|
||||
entity instanceof CreeperEntity ? 100 : Integer.MAX_VALUE, 0));
|
||||
|
||||
@@ -12,6 +12,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tags.ITag;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -86,8 +87,8 @@ public class SubTileOrechid extends TileEntityFunctionalFlower {
|
||||
Map<ResourceLocation, Integer> map = getOreMap();
|
||||
List<TagRandomItem> values = map.entrySet().stream()
|
||||
.flatMap(e -> {
|
||||
Tag<Block> tag = BlockTags.getCollection().get(e.getKey());
|
||||
if (tag != null && !tag.getAllElements().isEmpty()) {
|
||||
ITag<Block> tag = BlockTags.getCollection().get(e.getKey());
|
||||
if (tag != null && !tag.func_230236_b_().isEmpty()) {
|
||||
return Stream.of(new TagRandomItem(e.getValue(), tag));
|
||||
} else {
|
||||
return Stream.empty();
|
||||
@@ -99,7 +100,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower {
|
||||
return null;
|
||||
}
|
||||
|
||||
Tag<Block> ore = WeightedRandom.getRandomItem(getWorld().rand, values).tag;
|
||||
ITag<Block> ore = WeightedRandom.getRandomItem(getWorld().rand, values).tag;
|
||||
return ore.getRandomElement(getWorld().getRandom()).getDefaultState();
|
||||
}
|
||||
|
||||
@@ -162,9 +163,9 @@ public class SubTileOrechid extends TileEntityFunctionalFlower {
|
||||
|
||||
private static class TagRandomItem extends WeightedRandom.Item {
|
||||
|
||||
public final Tag<Block> tag;
|
||||
public final ITag<Block> tag;
|
||||
|
||||
public TagRandomItem(int weight, Tag<Block> tag) {
|
||||
public TagRandomItem(int weight, ITag<Block> tag) {
|
||||
super(weight);
|
||||
this.tag = tag;
|
||||
}
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid {
|
||||
|
||||
@Override
|
||||
public boolean canOperate() {
|
||||
return getWorld().getDimension().isNether();
|
||||
return getWorld().func_230315_m_().func_236037_d_();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+3
-3
@@ -23,7 +23,7 @@ import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
@@ -152,11 +152,11 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
|
||||
|
||||
if (!recieverStack.isEmpty()) {
|
||||
ITextComponent stackName = recieverStack.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName.getString()) / 2;
|
||||
int width = 16 + mc.fontRenderer.func_238414_a_(stackName) / 2;
|
||||
int x = mc.getMainWindow().getScaledWidth() / 2 - width;
|
||||
int y = mc.getMainWindow().getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(stackName.getFormattedText(), x + 20, y + 5, color);
|
||||
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -19,7 +19,7 @@ import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
@@ -95,7 +95,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower {
|
||||
}
|
||||
|
||||
static void spawnExplosionParticles(Entity item, int p) {
|
||||
PacketHandler.sendToNearby(item.world, new BlockPos(item), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.getPosX(), item.getPosY(), item.getPosZ(), item.getEntityId(), p));
|
||||
PacketHandler.sendToNearby(item.world, item.func_233580_cy_(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.getPosX(), item.getPosY(), item.getPosZ(), item.getEntityId(), p));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -40,7 +40,7 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower {
|
||||
|
||||
List<PlayerEntity> players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
|
||||
for (PlayerEntity player : players) {
|
||||
if (ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) {
|
||||
if (ExperienceHelper.getPlayerXP(player) >= 1 && player.func_233570_aj_()) {
|
||||
ExperienceHelper.drainPlayerXP(player, 1);
|
||||
addMana(50);
|
||||
return;
|
||||
|
||||
@@ -17,7 +17,7 @@ import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.Vector3d;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
|
||||
|
||||
+2
-2
@@ -10,7 +10,7 @@ package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.TNTEntity;
|
||||
import net.minecraft.fluid.IFluidState;
|
||||
import net.minecraft.fluid.FluidState;
|
||||
import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.SoundEvents;
|
||||
@@ -42,7 +42,7 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower {
|
||||
if (!getWorld().isRemote && getMana() == 0) {
|
||||
List<TNTEntity> tnts = getWorld().getEntitiesWithinAABB(TNTEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1)));
|
||||
for (TNTEntity tnt : tnts) {
|
||||
IFluidState fluid = getWorld().getFluidState(new BlockPos(tnt));
|
||||
FluidState fluid = getWorld().getFluidState(tnt.func_233580_cy_());
|
||||
if (tnt.getFuse() == 1 && tnt.isAlive() && fluid.isEmpty()) {
|
||||
tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (getWorld().rand.nextFloat() - getWorld().rand.nextFloat()) * 0.2F) * 0.7F);
|
||||
tnt.remove();
|
||||
|
||||
Loaded 100 of 236 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user