Change api recipe interfaces to use IInventory, reformat

This commit is contained in:
Vincent Lee committed 2020-06-28 16:55:34 -05:00
1 parent 18359eb58e
commit 3530a2de69
86 files changed
+187 -180

No files matched your search

@@ -9,6 +9,7 @@
package vazkii.botania.api.internal;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
@@ -9,6 +9,7 @@
package vazkii.botania.api.internal;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
@@ -8,6 +8,7 @@
*/
package vazkii.botania.api.recipe;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeType;
@@ -20,7 +21,7 @@ import vazkii.botania.api.brew.Brew;
import javax.annotation.Nonnull;
public interface IBrewRecipe extends IRecipe<RecipeWrapper> {
public interface IBrewRecipe extends IRecipe<IInventory> {
ResourceLocation TYPE_ID = new ResourceLocation(BotaniaAPI.MODID, "brew");
Brew getBrew();
@@ -43,7 +44,7 @@ public interface IBrewRecipe extends IRecipe<RecipeWrapper> {
@Nonnull
@Override
default ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) {
default ItemStack getCraftingResult(@Nonnull IInventory inv) {
return ItemStack.EMPTY;
}
@@ -8,6 +8,7 @@
*/
package vazkii.botania.api.recipe;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.util.ResourceLocation;
@@ -18,7 +19,7 @@ import vazkii.botania.api.BotaniaAPI;
import javax.annotation.Nonnull;
public interface IPetalRecipe extends IRecipe<RecipeWrapper> {
public interface IPetalRecipe extends IRecipe<IInventory> {
ResourceLocation TYPE_ID = new ResourceLocation(BotaniaAPI.MODID, "petal_apothecary");
@Nonnull
@@ -8,6 +8,7 @@
*/
package vazkii.botania.api.recipe;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.util.ResourceLocation;
@@ -18,7 +19,7 @@ import vazkii.botania.api.BotaniaAPI;
import javax.annotation.Nonnull;
public interface IRuneAltarRecipe extends IRecipe<RecipeWrapper> {
public interface IRuneAltarRecipe extends IRecipe<IInventory> {
ResourceLocation TYPE_ID = new ResourceLocation(BotaniaAPI.MODID, "runic_altar");
int getManaUsage();
@@ -9,6 +9,7 @@
package vazkii.botania.api.subtile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.PlayerEntity;
@@ -9,6 +9,7 @@
package vazkii.botania.api.subtile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
@@ -9,6 +9,7 @@
package vazkii.botania.api.subtile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
@@ -9,6 +9,7 @@
package vazkii.botania.api.wand;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -23,7 +23,6 @@ import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Effects;
import net.minecraft.util.math.vector.Vector3f;
import vazkii.botania.api.item.ICosmeticAttachable;
@@ -56,21 +55,21 @@ public final class BaubleRenderHandler extends LayerRenderer<AbstractClientPlaye
ms.push();
CuriosAPI.getCuriosHandler(player).ifPresent(handler -> {
Map<String, CurioStackHandler> curios = handler.getCurioMap();
for (Map.Entry<String, CurioStackHandler> e : curios.entrySet()) {
for (int i = 0; i < e.getValue().getSlots(); i++) {
ItemStack stack = e.getValue().getStackInSlot(i);
if (!stack.isEmpty()) {
Item item = stack.getItem();
ItemStack toRender = stack;
if (item instanceof IPhantomInkable) {
IPhantomInkable inkable = (IPhantomInkable) item;
if (inkable.hasPhantomInk(stack)) {
continue;
}
}
if (item instanceof ICosmeticAttachable) {
ICosmeticAttachable attachable = (ICosmeticAttachable) item;
ItemStack cosmetic = attachable.getCosmeticItem(stack);
@@ -78,7 +77,7 @@ public final class BaubleRenderHandler extends LayerRenderer<AbstractClientPlaye
toRender = cosmetic;
}
}
toRender.getCapability(CuriosCapability.ITEM).ifPresent(c -> {
if (c.hasRender(e.getKey(), player) && c instanceof CurioIntegration.Wrapper) {
ms.push();
@@ -83,12 +83,12 @@ public final class ItemsRemainingRenderHandler {
ITextComponent maxText = new StringTextComponent(Integer.toString(max)).func_240699_a_(TextFormatting.GRAY);
ITextComponent remText = new StringTextComponent(Integer.toString(rem)).func_240699_a_(TextFormatting.YELLOW);
text = new StringTextComponent(count + " (")
.func_230529_a_(stacksText)
.func_240702_b_("*")
.func_230529_a_(maxText)
.func_240702_b_("+")
.func_230529_a_(remText)
.func_240702_b_(")");
.func_230529_a_(stacksText)
.func_240702_b_("*")
.func_230529_a_(maxText)
.func_240702_b_("+")
.func_230529_a_(remText)
.func_240702_b_(")");
}
} else if (count == -1) {
text = new StringTextComponent("\u221E");
@@ -173,9 +173,9 @@ public class ClientProxy implements IProxy {
private static void registerPropertyGetters() {
registerPropertyGetter(ModItems.blackHoleTalisman, prefix("active"),
(stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemBlackHoleTalisman.TAG_ACTIVE, false) ? 1 : 0);
(stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemBlackHoleTalisman.TAG_ACTIVE, false) ? 1 : 0);
registerPropertyGetter(ModItems.manaBottle, prefix("swigs_taken"),
(stack, world, entity) -> ItemBottledMana.SWIGS - ItemBottledMana.getSwigsLeft(stack));
(stack, world, entity) -> ItemBottledMana.SWIGS - ItemBottledMana.getSwigsLeft(stack));
ResourceLocation vuvuzelaId = prefix("vuvuzela");
IItemPropertyGetter isVuvuzela = (stack, world, entity) -> stack.getDisplayName().getString().toLowerCase(Locale.ROOT).contains("vuvuzela") ? 1 : 0;
@@ -185,15 +185,15 @@ public class ClientProxy implements IProxy {
registerPropertyGetter(ModItems.lexicon, prefix("elven"), (stack, world, living) -> ModItems.lexicon.isElvenItem(stack) ? 1 : 0);
registerPropertyGetter(ModItems.manaCookie, prefix("totalbiscuit"),
(stack, world, entity) -> stack.getDisplayName().getString().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F);
(stack, world, entity) -> stack.getDisplayName().getString().toLowerCase(Locale.ROOT).contains("totalbiscuit") ? 1F : 0F);
registerPropertyGetter(ModItems.slimeBottle, prefix("active"),
(stack, world, entity) -> stack.hasTag() && stack.getTag().getBoolean(ItemSlimeBottle.TAG_ACTIVE) ? 1.0F : 0.0F);
(stack, world, entity) -> stack.hasTag() && stack.getTag().getBoolean(ItemSlimeBottle.TAG_ACTIVE) ? 1.0F : 0.0F);
registerPropertyGetter(ModItems.spawnerMover, prefix("full"),
(stack, world, entity) -> ItemSpawnerMover.hasData(stack) ? 1 : 0);
(stack, world, entity) -> ItemSpawnerMover.hasData(stack) ? 1 : 0);
registerPropertyGetter(ModItems.temperanceStone, prefix("active"),
(stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemTemperanceStone.TAG_ACTIVE, false) ? 1 : 0);
(stack, world, entity) -> ItemNBTHelper.getBoolean(stack, ItemTemperanceStone.TAG_ACTIVE, false) ? 1 : 0);
registerPropertyGetter(ModItems.twigWand, prefix("bindmode"),
(stack, world, entity) -> ItemTwigWand.getBindMode(stack) ? 1 : 0);
(stack, world, entity) -> ItemTwigWand.getBindMode(stack) ? 1 : 0);
ResourceLocation poolFullId = prefix("full");
IItemPropertyGetter poolFull = (stack, world, entity) -> {
@@ -225,19 +225,19 @@ public class ClientProxy implements IProxy {
registerPropertyGetter(ModItems.magnetRingGreater, prefix("on"), ringOnGetter);
registerPropertyGetter(ModItems.elementiumShears, prefix("reddit"),
(stack, world, entity) -> stack.getDisplayName().getString().equalsIgnoreCase("dammit reddit") ? 1F : 0F);
(stack, world, entity) -> stack.getDisplayName().getString().equalsIgnoreCase("dammit reddit") ? 1F : 0F);
registerPropertyGetter(ModItems.manasteelSword, prefix("elucidator"),
(stack, world, entity) -> "the elucidator".equals(stack.getDisplayName().getString().toLowerCase().trim()) ? 1 : 0);
(stack, world, entity) -> "the elucidator".equals(stack.getDisplayName().getString().toLowerCase().trim()) ? 1 : 0);
registerPropertyGetter(ModItems.terraAxe, prefix("terraaxe_on"),
(stack, world, entity) -> entity instanceof PlayerEntity && !ItemTerraAxe.shouldBreak((PlayerEntity) entity) ? 0 : 1);
(stack, world, entity) -> entity instanceof PlayerEntity && !ItemTerraAxe.shouldBreak((PlayerEntity) entity) ? 0 : 1);
registerPropertyGetter(ModItems.terraPick, prefix("tipped"),
(stack, world, entity) -> ItemTerraPick.isTipped(stack) ? 1 : 0);
(stack, world, entity) -> ItemTerraPick.isTipped(stack) ? 1 : 0);
registerPropertyGetter(ModItems.terraPick, prefix("enabled"),
(stack, world, entity) -> ItemTerraPick.isEnabled(stack) ? 1 : 0);
(stack, world, entity) -> ItemTerraPick.isEnabled(stack) ? 1 : 0);
registerPropertyGetter(ModItems.infiniteFruit, prefix("boot"),
(stack, worldIn, entity) -> ItemInfiniteFruit.isBoot(stack) ? 1F : 0F);
(stack, worldIn, entity) -> ItemInfiniteFruit.isBoot(stack) ? 1F : 0F);
registerPropertyGetter(ModItems.tornadoRod, prefix("flying"),
(stack, world, living) -> ItemTornadoRod.isFlying(stack) ? 1 : 0);
(stack, world, living) -> ItemTornadoRod.isFlying(stack) ? 1 : 0);
IItemPropertyGetter pulling = ItemModelsProperties.func_239417_a_(Items.BOW, new ResourceLocation("pulling"));
IItemPropertyGetter pull = (stack, worldIn, entity) -> {
@@ -246,8 +246,8 @@ public class ClientProxy implements IProxy {
} else {
ItemLivingwoodBow item = ((ItemLivingwoodBow) stack.getItem());
return entity.getActiveItemStack() != stack
? 0.0F
: (stack.getUseDuration() - entity.getItemInUseCount()) * item.chargeVelocityMultiplier() / 20.0F;
? 0.0F
: (stack.getUseDuration() - entity.getItemInUseCount()) * item.chargeVelocityMultiplier() / 20.0F;
}
};
registerPropertyGetter(ModItems.livingwoodBow, new ResourceLocation("pulling"), pulling);
@@ -10,9 +10,9 @@ package vazkii.botania.client.fx;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.network.PacketBuffer;
import net.minecraft.particles.IParticleData;
import net.minecraft.particles.ParticleType;
@@ -24,14 +24,14 @@ import java.util.Locale;
public class SparkleParticleData implements IParticleData {
public static final Codec<SparkleParticleData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.FLOAT.fieldOf("size").forGetter(d -> d.size),
Codec.FLOAT.fieldOf("r").forGetter(d -> d.r),
Codec.FLOAT.fieldOf("g").forGetter(d -> d.g),
Codec.FLOAT.fieldOf("b").forGetter(d -> d.b),
Codec.INT.fieldOf("m").forGetter(d -> d.m),
Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip),
Codec.BOOL.fieldOf("fake").forGetter(d -> d.fake),
Codec.BOOL.fieldOf("corrupt").forGetter(d -> d.corrupt)
Codec.FLOAT.fieldOf("size").forGetter(d -> d.size),
Codec.FLOAT.fieldOf("r").forGetter(d -> d.r),
Codec.FLOAT.fieldOf("g").forGetter(d -> d.g),
Codec.FLOAT.fieldOf("b").forGetter(d -> d.b),
Codec.INT.fieldOf("m").forGetter(d -> d.m),
Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip),
Codec.BOOL.fieldOf("fake").forGetter(d -> d.fake),
Codec.BOOL.fieldOf("corrupt").forGetter(d -> d.corrupt)
).apply(instance, SparkleParticleData::new));
public final float size;
public final float r, g, b;
@@ -9,6 +9,7 @@
package vazkii.botania.client.fx;
import com.mojang.serialization.Codec;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
import net.minecraft.client.particle.Particle;
@@ -10,9 +10,9 @@ package vazkii.botania.client.fx;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.network.PacketBuffer;
import net.minecraft.particles.IParticleData;
import net.minecraft.particles.ParticleType;
@@ -24,15 +24,15 @@ import java.util.Locale;
public class WispParticleData implements IParticleData {
public static final Codec<WispParticleData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.FLOAT.fieldOf("size").forGetter(d -> d.size),
Codec.FLOAT.fieldOf("r").forGetter(d -> d.r),
Codec.FLOAT.fieldOf("g").forGetter(d -> d.g),
Codec.FLOAT.fieldOf("b").forGetter(d -> d.b),
Codec.FLOAT.fieldOf("maxAgeMul").forGetter(d -> d.maxAgeMul),
Codec.BOOL.fieldOf("depthTest").forGetter(d -> d.depthTest),
Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip)
)
.apply(instance, WispParticleData::new));
Codec.FLOAT.fieldOf("size").forGetter(d -> d.size),
Codec.FLOAT.fieldOf("r").forGetter(d -> d.r),
Codec.FLOAT.fieldOf("g").forGetter(d -> d.g),
Codec.FLOAT.fieldOf("b").forGetter(d -> d.b),
Codec.FLOAT.fieldOf("maxAgeMul").forGetter(d -> d.maxAgeMul),
Codec.BOOL.fieldOf("depthTest").forGetter(d -> d.depthTest),
Codec.BOOL.fieldOf("noClip").forGetter(d -> d.noClip)
)
.apply(instance, WispParticleData::new));
public final float size;
public final float r, g, b;
public final float maxAgeMul;
@@ -10,6 +10,7 @@ package vazkii.botania.client.fx;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.client.particle.IAnimatedSprite;
import net.minecraft.client.particle.IParticleFactory;
import net.minecraft.client.particle.Particle;
@@ -27,8 +27,8 @@ import net.minecraft.item.crafting.Ingredient;
import net.minecraft.tags.BlockTags;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.TranslationTextComponent;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.recipe.IElvenTradeRecipe;
@@ -31,8 +31,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.TranslationTextComponent;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.recipe.IElvenTradeRecipe;
@@ -19,8 +19,8 @@ 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;
@@ -9,12 +9,13 @@
package vazkii.botania.client.patchouli.component;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.common.block.tile.mana.TilePool;
import vazkii.patchouli.api.IComponentRenderContext;
@@ -20,9 +20,9 @@ import net.minecraft.client.renderer.model.IBakedModel;
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;
@@ -15,8 +15,8 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
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;
@@ -17,9 +17,9 @@ 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;
@@ -15,10 +15,10 @@ import net.minecraft.client.renderer.*;
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;
@@ -21,9 +21,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
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;
@@ -17,8 +17,8 @@ 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;
@@ -21,8 +21,8 @@ import net.minecraft.item.ItemStack;
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;
@@ -16,8 +16,8 @@ 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;
@@ -18,8 +18,8 @@ import net.minecraft.client.renderer.RenderTypeLookup;
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;
@@ -22,8 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
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;
@@ -17,9 +17,9 @@ 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;
@@ -16,8 +16,8 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
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;
@@ -16,8 +16,8 @@ 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;
@@ -19,8 +19,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
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;
@@ -17,9 +17,9 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
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;
@@ -21,8 +21,8 @@ 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;
@@ -17,8 +17,8 @@ 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;
@@ -18,8 +18,8 @@ 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> {
@@ -21,8 +21,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
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;
@@ -18,8 +18,8 @@ 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;
@@ -16,8 +16,8 @@ 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;
@@ -21,9 +21,9 @@ import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
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;
@@ -14,8 +14,8 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.IRenderTypeBuffer;
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;
@@ -15,8 +15,8 @@ import net.minecraft.client.renderer.IRenderTypeBuffer;
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;
@@ -227,13 +227,13 @@ public class Botania {
}
GlobalEntityTypeAttributes.put(ModEntities.DOPPLEGANGER, MobEntity.func_233666_p_()
.func_233815_a_(Attributes.field_233821_d_, 0.4)
.func_233815_a_(Attributes.field_233818_a_, EntityDoppleganger.MAX_HP)
.func_233815_a_(Attributes.field_233820_c_, 1.0)
.func_233813_a_());
.func_233815_a_(Attributes.field_233821_d_, 0.4)
.func_233815_a_(Attributes.field_233818_a_, EntityDoppleganger.MAX_HP)
.func_233815_a_(Attributes.field_233820_c_, 1.0)
.func_233813_a_());
GlobalEntityTypeAttributes.put(ModEntities.PIXIE, MobEntity.func_233666_p_()
.func_233815_a_(Attributes.field_233818_a_, 2.0)
.func_233813_a_());
.func_233815_a_(Attributes.field_233818_a_, 2.0)
.func_233813_a_());
ModBanners.init();
ColorHelper.init();
ModLootModifiers.init();
@@ -9,6 +9,7 @@
package vazkii.botania.common.block;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.ITileEntityProvider;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.LivingEntity;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.FlowerBlock;
@@ -26,9 +27,9 @@ 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.vector.Vector3d;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
@@ -147,7 +147,7 @@ public final class ModBlocks {
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)
.func_235838_a_(s -> s.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0));
.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));
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.mana;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.mana;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.ITileEntityProvider;
@@ -25,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.IForgeShearable;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.mana.IManaTrigger;
import vazkii.botania.common.block.BlockModWaterloggable;
@@ -83,7 +83,7 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg
for (MobEntity entity : entities) {
if (entity instanceof IShearable && ((IShearable) entity).func_230262_K__()
|| entity instanceof IForgeShearable && ((IForgeShearable) entity).isShearable(stack, world, entity.func_233580_cy_()) ) {
|| 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());
@@ -120,9 +120,9 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg
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
world.rand.nextFloat() * 0.05F,
(world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F,
(world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F
));
}
}
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.mana;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
import net.minecraft.block.ITileEntityProvider;
@@ -9,8 +9,8 @@
package vazkii.botania.common.block.mana;
import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockRenderType;
import net.minecraft.block.BlockState;
@@ -19,9 +19,9 @@ 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.vector.Vector3d;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.mana;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.subtile.functional;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -9,8 +9,8 @@
package vazkii.botania.common.block.tile;
import com.google.common.base.Predicates;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
@@ -9,6 +9,7 @@
package vazkii.botania.common.block.tile.mana;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -18,8 +18,8 @@ import net.minecraft.command.Commands;
import net.minecraft.command.arguments.EntityArgument;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.world.SkyblockWorldEvents;
@@ -9,6 +9,7 @@
package vazkii.botania.common.core.handler;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
@@ -24,8 +24,8 @@ import net.minecraft.util.Util;
import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.entity.EntityPixie;
import vazkii.botania.common.item.ModItems;
@@ -9,9 +9,9 @@
package vazkii.botania.common.core.helper;
import com.google.gson.JsonObject;
import com.mojang.serialization.Dynamic;
import com.mojang.serialization.JsonOps;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.INBT;
@@ -1,3 +1,11 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.common.core.loot;
import net.minecraft.loot.LootConditionType;
@@ -39,8 +39,7 @@ public class TrueGuardianKiller implements ILootCondition {
public static class Serializer implements ILootSerializer<TrueGuardianKiller> {
@Override
public void func_230424_a_(JsonObject json, TrueGuardianKiller condition, JsonSerializationContext ctx) {
}
public void func_230424_a_(JsonObject json, TrueGuardianKiller condition, JsonSerializationContext ctx) {}
@Override
public TrueGuardianKiller func_230423_a_(JsonObject json, JsonDeserializationContext ctx) {
@@ -13,6 +13,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.crafting.IRecipeSerializer;
@@ -49,7 +50,7 @@ public class RecipeBrew implements IBrewRecipe {
}
@Override
public boolean matches(RecipeWrapper inv, @Nonnull World world) {
public boolean matches(IInventory inv, @Nonnull World world) {
List<Ingredient> inputsMissing = new ArrayList<>(inputs);
for (int i = 0; i < inv.getSizeInventory(); i++) {
@@ -12,6 +12,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.item.crafting.Ingredient;
@@ -44,7 +45,7 @@ public class RecipePetals implements IPetalRecipe {
}
@Override
public boolean matches(RecipeWrapper inv, @Nonnull World world) {
public boolean matches(IInventory inv, @Nonnull World world) {
List<Ingredient> ingredientsMissing = new ArrayList<>(inputs);
for (int i = 0; i < inv.getSizeInventory(); i++) {
@@ -81,7 +82,7 @@ public class RecipePetals implements IPetalRecipe {
@Nonnull
@Override
public ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) {
public ItemStack getCraftingResult(@Nonnull IInventory inv) {
return getRecipeOutput().copy();
}
@@ -13,6 +13,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipeSerializer;
import net.minecraft.item.crafting.Ingredient;
@@ -49,7 +50,7 @@ public class RecipeRuneAltar implements IRuneAltarRecipe {
}
@Override
public boolean matches(RecipeWrapper inv, @Nonnull World world) {
public boolean matches(IInventory inv, @Nonnull World world) {
List<Ingredient> ingredientsMissing = new ArrayList<>(inputs);
for (int i = 0; i < inv.getSizeInventory(); i++) {
@@ -86,7 +87,7 @@ public class RecipeRuneAltar implements IRuneAltarRecipe {
@Nonnull
@Override
public ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) {
public ItemStack getCraftingResult(@Nonnull IInventory inv) {
return getRecipeOutput().copy();
}
@@ -11,9 +11,9 @@ package vazkii.botania.common.crafting;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.mojang.serialization.Dynamic;
import com.mojang.serialization.JsonOps;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
@@ -12,6 +12,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.crafting.IRecipeSerializer;
@@ -41,7 +42,7 @@ public class HeadRecipe extends RecipeRuneAltar {
}
@Override
public boolean matches(RecipeWrapper inv, @Nonnull World world) {
public boolean matches(IInventory inv, @Nonnull World world) {
boolean matches = super.matches(inv, world);
if (matches) {
@@ -65,7 +66,7 @@ public class HeadRecipe extends RecipeRuneAltar {
@Nonnull
@Override
public ItemStack getCraftingResult(@Nonnull RecipeWrapper inv) {
public ItemStack getCraftingResult(@Nonnull IInventory inv) {
ItemStack stack = getRecipeOutput().copy();
for (int i = 0; i < inv.getSizeInventory(); i++) {
ItemStack ingr = inv.getStackInSlot(i);
@@ -150,7 +150,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst {
RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_, RayTraceContext.BlockMode.OUTLINE);
boolean flag = false;
if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) {
BlockPos blockpos = ((BlockRayTraceResult)raytraceresult).getPos();
BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos();
BlockState blockstate = this.world.getBlockState(blockpos);
if (blockstate.isIn(Blocks.NETHER_PORTAL)) {
this.setPortal(blockpos);
@@ -158,7 +158,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst {
} else if (blockstate.isIn(Blocks.END_GATEWAY)) {
TileEntity tileentity = this.world.getTileEntity(blockpos);
if (tileentity instanceof EndGatewayTileEntity) {
((EndGatewayTileEntity)tileentity).teleportEntity(this);
((EndGatewayTileEntity) tileentity).teleportEntity(this);
}
flag = true;
@@ -176,7 +176,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst {
this.func_234617_x_();
float f;
if (this.isInWater()) {
for(int i = 0; i < 4; ++i) {
for (int i = 0; i < 4; ++i) {
float f1 = 0.25F;
this.world.addParticle(ParticleTypes.BUBBLE, d2 - vector3d.x * 0.25D, d0 - vector3d.y * 0.25D, d1 - vector3d.z * 0.25D, vector3d.x, vector3d.y, vector3d.z);
}
@@ -189,7 +189,7 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst {
// Botania: no drag this.setMotion(vector3d.scale((double)f));
if (!this.hasNoGravity()) {
Vector3d vector3d1 = this.getMotion();
this.setMotion(vector3d1.x, vector3d1.y - (double)this.getGravityVelocity(), vector3d1.z);
this.setMotion(vector3d1.x, vector3d1.y - (double) this.getGravityVelocity(), vector3d1.z);
}
this.setPosition(d2, d0, d1);
@@ -6,40 +6,9 @@
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
/* todo 1.16 curios
package vazkii.botania.common.integration.curios;
import com.google.common.collect.Multimap;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fml.InterModComms;
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import org.apache.commons.lang3.tuple.ImmutableTriple;
import top.theillusivec4.curios.api.CuriosAPI;
import top.theillusivec4.curios.api.capability.CuriosCapability;
import top.theillusivec4.curios.api.capability.ICurio;
import top.theillusivec4.curios.api.event.LivingCurioDropRulesEvent;
import top.theillusivec4.curios.api.imc.CurioIMCMessage;
import vazkii.botania.client.core.handler.BaubleRenderHandler;
import vazkii.botania.common.capability.SimpleCapProvider;
import vazkii.botania.common.core.handler.EquipmentHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.item.ItemKeepIvy;
import vazkii.botania.common.item.equipment.bauble.ItemBauble;
import java.util.function.Predicate;
/*
// Classloading-safe way to attach curio behaviour to our items
public class CurioIntegration extends EquipmentHandler {
@@ -159,5 +128,4 @@ public class CurioIntegration extends EquipmentHandler {
getItem().doRender(layer, stack, player, ms, buffers, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch);
}
}
}
*/
}*/
@@ -9,8 +9,8 @@
package vazkii.botania.common.item.brew;
import com.google.common.collect.Lists;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.attributes.Attribute;
@@ -136,12 +136,12 @@ public class ItemBrewBase extends Item implements IBrewItem {
if (list.isEmpty()) {
lores.add((new TranslationTextComponent("effect.none")).func_240699_a_(TextFormatting.GRAY));
} else {
for(EffectInstance effectinstance : list) {
for (EffectInstance effectinstance : list) {
IFormattableTextComponent iformattabletextcomponent = new TranslationTextComponent(effectinstance.getEffectName());
Effect effect = effectinstance.getPotion();
Map<Attribute, AttributeModifier> map = effect.getAttributeModifierMap();
if (!map.isEmpty()) {
for(Map.Entry<Attribute, AttributeModifier> entry : map.entrySet()) {
for (Map.Entry<Attribute, AttributeModifier> entry : map.entrySet()) {
AttributeModifier attributemodifier = entry.getValue();
AttributeModifier attributemodifier1 = new AttributeModifier(attributemodifier.getName(), effect.getAttributeModifierAmount(effectinstance.getAmplifier(), attributemodifier), attributemodifier.getOperation());
list1.add(new Pair<>(entry.getKey(), attributemodifier1));
@@ -164,7 +164,7 @@ public class ItemBrewBase extends Item implements IBrewItem {
lores.add(StringTextComponent.field_240750_d_);
lores.add((new TranslationTextComponent("potion.whenDrank")).func_240699_a_(TextFormatting.DARK_PURPLE));
for(Pair<Attribute, AttributeModifier> pair : list1) {
for (Pair<Attribute, AttributeModifier> pair : list1) {
AttributeModifier attributemodifier2 = pair.getSecond();
double d0 = attributemodifier2.getAmount();
double d1;
@@ -9,6 +9,7 @@
package vazkii.botania.common.item.relic;
import com.mojang.datafixers.util.Pair;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -33,6 +34,7 @@ import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
import javax.annotation.Nonnull;
import java.util.Optional;
public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem {
@@ -139,8 +141,8 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs
INBT nbt = ItemNBTHelper.get(stack, TAG_LOCATION);
if (nbt != null) {
return GlobalPos.field_239645_a_.decode(NBTDynamicOps.INSTANCE, nbt).result()
.map(Pair::getFirst)
.map(GlobalPos::getPos).orElse(null);
.map(Pair::getFirst)
.map(GlobalPos::getPos).orElse(null);
}
return null;
}
@@ -14,6 +14,7 @@ import net.minecraft.item.DyeColor;
import net.minecraft.item.Item;
import net.minecraft.tags.*;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.client.lib.LibResources;
import java.lang.invoke.MethodHandle;
@@ -8,21 +8,21 @@
*/
package vazkii.botania.common.world;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.world.gen.feature.IFeatureConfig;
import vazkii.botania.common.core.handler.ConfigHandler;
public class MysticalFlowerConfig implements IFeatureConfig {
public static final Codec<MysticalFlowerConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
Codec.INT.fieldOf("flower_patch_size").forGetter(MysticalFlowerConfig::getFlowerPatchSize),
Codec.INT.fieldOf("mushroom_patch_size").forGetter(MysticalFlowerConfig::getMushroomPatchSize),
Codec.INT.fieldOf("patch_count").forGetter(MysticalFlowerConfig::getPatchCount),
Codec.INT.fieldOf("patch_density").forGetter(MysticalFlowerConfig::getPatchDensity),
Codec.INT.fieldOf("patch_chance").forGetter(MysticalFlowerConfig::getPatchChance),
Codec.DOUBLE.fieldOf("tall_chance").forGetter(MysticalFlowerConfig::getTallChance)
Codec.INT.fieldOf("flower_patch_size").forGetter(MysticalFlowerConfig::getFlowerPatchSize),
Codec.INT.fieldOf("mushroom_patch_size").forGetter(MysticalFlowerConfig::getMushroomPatchSize),
Codec.INT.fieldOf("patch_count").forGetter(MysticalFlowerConfig::getPatchCount),
Codec.INT.fieldOf("patch_density").forGetter(MysticalFlowerConfig::getPatchDensity),
Codec.INT.fieldOf("patch_chance").forGetter(MysticalFlowerConfig::getPatchChance),
Codec.DOUBLE.fieldOf("tall_chance").forGetter(MysticalFlowerConfig::getTallChance)
).apply(instance, MysticalFlowerConfig::new));
private final int flowerPatchSize;
@@ -34,12 +34,12 @@ public class MysticalFlowerConfig implements IFeatureConfig {
public static MysticalFlowerConfig fromConfig() {
return new MysticalFlowerConfig(
ConfigHandler.COMMON.flowerPatchSize.get(),
ConfigHandler.COMMON.mushroomQuantity.get(),
ConfigHandler.COMMON.flowerPatchSize.get(),
ConfigHandler.COMMON.flowerDensity.get(),
ConfigHandler.COMMON.flowerPatchChance.get(),
ConfigHandler.COMMON.flowerTallChance.get()
ConfigHandler.COMMON.flowerPatchSize.get(),
ConfigHandler.COMMON.mushroomQuantity.get(),
ConfigHandler.COMMON.flowerPatchSize.get(),
ConfigHandler.COMMON.flowerDensity.get(),
ConfigHandler.COMMON.flowerPatchChance.get(),
ConfigHandler.COMMON.flowerTallChance.get()
);
}
@@ -17,8 +17,8 @@ import net.minecraft.world.ISeedReader;
import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.Heightmap;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.structure.StructureManager;
import vazkii.botania.common.block.BlockModFlower;
import vazkii.botania.common.block.ModBlocks;
@@ -9,6 +9,7 @@
package vazkii.botania.common.world;
import com.mojang.serialization.Dynamic;
import net.minecraft.block.BlockState;
import net.minecraft.item.DyeColor;
import net.minecraft.util.math.BlockPos;
@@ -16,8 +17,8 @@ import net.minecraft.world.ISeedReader;
import net.minecraft.world.IWorld;
import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.structure.StructureManager;
import vazkii.botania.common.block.ModBlocks;
import java.util.Random;
@@ -10,6 +10,7 @@ package vazkii.botania.common.world;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.world.Blockreader;
import net.minecraft.world.IBlockReader;
@@ -23,10 +24,10 @@ import net.minecraft.world.gen.settings.DimensionStructuresSettings;
public class SkyblockChunkGenerator extends ChunkGenerator {
private static final Codec<SkyblockChunkGenerator> CODEC = RecordCodecBuilder.create(
instance -> instance.group(
BiomeProvider.field_235202_a_.fieldOf("biome_source").forGetter(scg -> scg.biomeProvider),
DimensionStructuresSettings.field_236190_a_.fieldOf("structures").forGetter(ChunkGenerator::func_235957_b_)
).apply(instance, instance.stable(SkyblockChunkGenerator::new)));
instance -> instance.group(
BiomeProvider.field_235202_a_.fieldOf("biome_source").forGetter(scg -> scg.biomeProvider),
DimensionStructuresSettings.field_236190_a_.fieldOf("structures").forGetter(ChunkGenerator::func_235957_b_)
).apply(instance, instance.stable(SkyblockChunkGenerator::new)));
public SkyblockChunkGenerator(BiomeProvider provider, DimensionStructuresSettings settings) {
super(provider, settings);
@@ -53,13 +54,10 @@ public class SkyblockChunkGenerator extends ChunkGenerator {
}
@Override
public void func_230350_a_(long seed, BiomeManager biomes, IChunk chunk, GenerationStage.Carving stage) {
}
public void func_230350_a_(long seed, BiomeManager biomes, IChunk chunk, GenerationStage.Carving stage) {}
@Override
public void func_230351_a_(WorldGenRegion region, StructureManager structureManager) {
}
public void func_230351_a_(WorldGenRegion region, StructureManager structureManager) {}
@Override
public int func_222529_a(int x, int z, Heightmap.Type heightmapType) {
@@ -23,22 +23,22 @@ public class WorldTypeSkyblock extends BiomeGeneratorTypeScreens {
public static boolean isWorldSkyblock(World world) {
return world.getChunkProvider() instanceof ServerChunkProvider
&& ((ServerChunkProvider) world.getChunkProvider()).getChunkGenerator() instanceof SkyblockChunkGenerator;
&& ((ServerChunkProvider) world.getChunkProvider()).getChunkGenerator() instanceof SkyblockChunkGenerator;
}
/* todo 1.16 impossible now?
@Override
public float getCloudHeight() {
return 260f;
}
// In skyblock worlds, do not darken the sky until player hits y=0
@Override
public double getHorizon(World world) {
return 0.0D;
}
@Override
public double voidFadeMagnitude() {
return 1.0D;
@@ -71,7 +71,7 @@ public class BlockTagProvider extends BlockTagsProvider {
);
func_240522_a_(ModTags.Blocks.FLOATING_FLOWERS).func_240531_a_(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS)
.func_240531_a_(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS);
.func_240531_a_(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS);
func_240522_a_(ModTags.Blocks.MYSTICAL_FLOWERS).func_240534_a_(
Arrays.stream(DyeColor.values())