more cleaning, fix commands and delete download command

This commit is contained in:
Vincent Lee committed 2019-03-12 18:38:56 -05:00
1 parent 884280f987
commit 3a8be04fa7
17 files changed
+142 -297

No files matched your search

@@ -15,10 +15,8 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCarpet;
import net.minecraft.block.BlockColored;
import net.minecraft.block.BlockStainedGlass;
import net.minecraft.block.BlockStainedGlassPane;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
@@ -29,8 +27,6 @@ import net.minecraft.item.EnumRarity;
import net.minecraft.item.IArmorMaterial;
import net.minecraft.item.IItemTier;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
@@ -40,8 +36,6 @@ import net.minecraft.util.SoundEvent;
import net.minecraft.util.registry.RegistryNamespaced;
import net.minecraft.util.registry.RegistryNamespacedDefaultedByKey;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.oredict.OreDictionary;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.internal.DummyMethodHandler;
@@ -384,6 +378,7 @@ public final class BotaniaAPI {
elvenKnowledge = registerKnowledgeType("alfheim", TextFormatting.DARK_GREEN, false);
relicKnowledge = registerKnowledgeType("relic", TextFormatting.DARK_PURPLE, false);
/* todo 1.13
addOreWeight("oreAluminum", 3940); // Tinkers' Construct
addOreWeight("oreAmber", 2075); // Thaumcraft
addOreWeight("oreApatite", 1595); // Forestry
@@ -454,6 +449,7 @@ public final class BotaniaAPI {
addOreWeightNether("oreArgonite", 1000); // Netherrocks
addOreWeightNether("oreOnyx", 500); // SimpleOres 2
addOreWeightNether("oreHaditeCoal", 500); // Hadite
*/
registerModWiki("minecraft", new SimpleWikiProvider("Minecraft Wiki", "https://minecraft.gamepedia.com/%s"));
@@ -599,7 +595,7 @@ public final class BotaniaAPI {
* @param mana The amount of mana required. Don't go over 100000!
* @return The recipe created.
*/
public static RecipeManaInfusion registerManaInfusionRecipe(ItemStack output, Object input, int mana) {
public static RecipeManaInfusion registerManaInfusionRecipe(ItemStack output, Ingredient input, int mana) {
Preconditions.checkArgument(mana <= 1000000);
RecipeManaInfusion recipe = new RecipeManaInfusion(output, input, mana);
manaInfusionRecipes.add(recipe);
@@ -622,7 +618,7 @@ public final class BotaniaAPI {
* Conjuration Catalyst below the pool).
* @see BotaniaAPI#registerManaInfusionRecipe
*/
public static RecipeManaInfusion registerManaConjurationRecipe(ItemStack output, Object input, int mana) {
public static RecipeManaInfusion registerManaConjurationRecipe(ItemStack output, Ingredient input, int mana) {
RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana);
recipe.setCatalyst(RecipeManaInfusion.conjurationState);
return recipe;
@@ -655,7 +651,7 @@ public final class BotaniaAPI {
* @param brew The brew in to be set in this recipe.
* @param inputs The items used in the recipe, no more than 6.
*/
public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) {
public static RecipeBrew registerBrewRecipe(Brew brew, Ingredient... inputs) {
Preconditions.checkArgument(inputs.length <= 6);
RecipeBrew recipe = new RecipeBrew(brew, inputs);
brewRecipes.add(recipe);
@@ -26,6 +26,9 @@ import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -111,6 +114,9 @@ public class Botania {
instance = this;
proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart);
MinecraftForge.EVENT_BUS.addListener(this::serverStarting);
MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
}
private void commonSetup(FMLCommonSetupEvent event) {
@@ -231,8 +237,7 @@ public class Botania {
// Overriding the internal method handler will break everything as it changes regularly.
// So just don't be a moron and don't override it. Thanks.
@EventHandler
public void serverStarting(FMLServerAboutToStartEvent event) {
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
String clname = BotaniaAPI.internalHandler.getClass().getName();
String expect = "vazkii.botania.common.core.handler.InternalMethodHandler";
if(!clname.equals(expect)) {
@@ -244,17 +249,14 @@ public class Botania {
}
}
@EventHandler
public void serverStarting(FMLServerStartingEvent event) {
// event.registerServerCommand(new CommandDownloadLatest());
event.registerServerCommand(new CommandShare());
event.registerServerCommand(new CommandOpen());
private void serverStarting(FMLServerStartingEvent event) {
CommandShare.register(event.getCommandDispatcher());
CommandOpen.register(event.getCommandDispatcher());
if(Botania.gardenOfGlassLoaded)
event.registerServerCommand(new CommandSkyblockSpread());
CommandSkyblockSpread.register(event.getCommandDispatcher());
}
@EventHandler
public void serverStopping(FMLServerStoppingEvent event) {
private void serverStopping(FMLServerStoppingEvent event) {
ManaNetworkHandler.instance.clear();
}
@@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.state.StateContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkCache;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
@@ -38,6 +37,7 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD {
builder.add(BotaniaStateProps.CRATE_PATTERN);
}
/* todo 1.13
@Nonnull
@Override
public IBlockState getActualState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) {
@@ -48,7 +48,7 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD {
}
return state;
}
}*/
@Nonnull
@Override
@@ -1,21 +0,0 @@
package vazkii.botania.common.block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockDreamwood extends BlockLivingwood {
public BlockDreamwood() {
super(LibBlockNames.DREAM_WOOD);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.elvenResources;
}
}
@@ -11,34 +11,27 @@
package vazkii.botania.common.block.mana;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.fluid.IFluidState;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemStack;
import net.minecraft.state.StateContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ChunkCache;
import net.minecraft.world.IBlockReader;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -48,15 +41,12 @@ import vazkii.botania.api.wand.IWandable;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.mana.TilePool;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Locale;
public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1);
private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 8, 16);
public enum Variant {
DEFAULT,
@@ -69,7 +59,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
public BlockPool(Variant v, Properties builder) {
super(builder);
BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
setDefaultState(stateContainer.getBaseState()
.with(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
this.variant = v;
@@ -83,23 +72,23 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
@Nonnull
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockReader world, BlockPos pos) {
return AABB;
public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) {
return SHAPE;
}
// If harvesting, delay setting block to air so getDrops can read the TE
@Override
public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest) {
public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest, IFluidState fluid) {
if (willHarvest)
return true;
return super.removedByPlayer(state, world, pos, player, willHarvest);
return super.removedByPlayer(state, world, pos, player, willHarvest, fluid);
}
@Override
public void getDrops(net.minecraft.util.NonNullList<ItemStack> drops, IBlockReader world, BlockPos pos, IBlockState state, int fortune) {
public void getDrops(IBlockState state, NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune) {
TileEntity te = world.getTileEntity(pos);
if (te instanceof TilePool && !((TilePool) te).fragile) {
super.getDrops(drops, world, pos, state, fortune);
super.getDrops(state, drops, world, pos, fortune);
}
}
@@ -107,7 +96,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
@Override
public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, @Nullable TileEntity te, ItemStack tool) {
super.harvestBlock(world, player, pos, state, te, tool);
world.setBlockToAir(pos);
world.removeBlock(pos);
}
@Override
@@ -117,7 +106,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
@Nonnull
@Override
public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) {
public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) {
return new TilePool();
}
@@ -137,6 +126,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
private static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(15/16.0, 0, 0, 1, 0.5, 1);
/* todo 1.13
@Override
public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List<AxisAlignedBB> boxes, Entity entity, boolean isActualState) {
addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB);
@@ -145,6 +135,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
addCollisionBoxToList(pos, entityBox, boxes, WEST_AABB);
addCollisionBoxToList(pos, entityBox, boxes, EAST_AABB);
}
*/
@Override
public boolean isFullCube(IBlockState state) {
@@ -10,13 +10,13 @@
*/
package vazkii.botania.common.block.mana;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.Block;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack;
import net.minecraft.state.StateContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
@@ -24,56 +24,44 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.mana.TilePump;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class BlockPump extends BlockMod implements ILexiconable {
private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75);
private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.25, 0, 0, 0.75, 0.5, 1);
private static final VoxelShape X_SHAPE = makeCuboidShape(0, 0, 4, 16, 8, 12);
private static final VoxelShape Z_SHAPE = makeCuboidShape(4, 0, 0, 12, 8, 16);
public BlockPump(Properties builder) {
super(builder);
setDefaultState(blockState.getBaseState().with(Properties.StaticProperty, true).with(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Nonnull
@Override
public BlockStateContainer createBlockState() {
return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty });
}
@Nonnull
@Override
public IBlockState getActualState(@Nonnull IBlockState state, IBlockReader world, BlockPos pos) {
return state.with(Properties.StaticProperty, true);
setDefaultState(getStateContainer().getBaseState().with(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) {
// todo getplacementstate
world.setBlockState(pos, state.with(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite()), 2);
protected void fillStateContainer(StateContainer.Builder<Block, IBlockState> builder) {
builder.add(BotaniaStateProps.CARDINALS);
}
@Nullable
@Override
public IBlockState getStateForPlacement(BlockItemUseContext context) {
return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getNearestLookingDirection().getOpposite());
}
@Nonnull
@Override
public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) {
if(state.get(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) {
return X_AABB;
return X_SHAPE;
} else {
return Z_AABB;
return Z_SHAPE;
}
}
@@ -10,14 +10,12 @@
*/
package vazkii.botania.common.block.mana;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -52,6 +50,7 @@ import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Locale;
public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider {
@@ -70,10 +69,9 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) {
EnumFacing orientation = EnumFacing.getDirectionFromEntityLiving(pos, par5EntityLivingBase);
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack par6ItemStack) {
EnumFacing orientation = EnumFacing.getFacingDirections(placer)[0];
TileSpreader spreader = (TileSpreader) world.getTileEntity(pos);
world.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2);
switch(orientation) {
case DOWN:
@@ -196,8 +194,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
}
@Override
public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) {
return FULL_BLOCK_AABB.offset(pos).shrink(1.0/16.0);
public List<AxisAlignedBB> getWireframeAABB(World world, BlockPos pos) {
return ImmutableList.of(new AxisAlignedBB(pos).shrink(1.0/16.0));
}
@Nonnull
@@ -19,7 +19,6 @@ import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.SubTileFunctional;
import vazkii.botania.common.block.ModFluffBlocks;
@@ -11,16 +11,15 @@
package vazkii.botania.common.block.tile;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ITickable;
@@ -29,6 +28,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.ISubTileSlowableContainer;
@@ -36,10 +36,14 @@ import vazkii.botania.api.subtile.SubTileEntity;
import vazkii.botania.api.wand.IWandBindable;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.string.TileRedStringRelay;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer, ITickable {
@ObjectHolder(LibMisc.MOD_ID + ":" + LibBlockNames.SPECIAL_FLOWER)
public static TileEntityType<TileSpecialFlower> TYPE;
private static final String TAG_SUBTILE_NAME = "subTileName";
private static final String TAG_SUBTILE_CMP = "subTileCmp";
@@ -47,6 +51,10 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil
public ResourceLocation subTileName = BotaniaAPI.DUMMY_SUBTILE_NAME;
private SubTileEntity subTile;
public TileSpecialFlower() {
super(TYPE);
}
@Override
public SubTileEntity getSubTile() {
return subTile;
@@ -1,58 +0,0 @@
/**
* This class was created by <Vazkii>. It's 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
*
* File Created @ [May 31, 2014, 11:43:13 PM (GMT)]
*/
package vazkii.botania.common.core.command;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import vazkii.botania.common.core.version.ThreadDownloadMod;
import vazkii.botania.common.core.version.VersionChecker;
import javax.annotation.Nonnull;
public class CommandDownloadLatest extends CommandBase {
private static final boolean ENABLED = true;
@Nonnull
@Override
public String getName() {
return "botania-download-latest";
}
@Nonnull
@Override
public String getUsage(@Nonnull ICommandSender var1) {
return "/botania-download-latest <version>";
}
@Override
public boolean checkPermission(MinecraftServer server, ICommandSender sender) {
return server.isSinglePlayer() || super.checkPermission(server, sender);
}
@Override
public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender var1, @Nonnull String[] var2) {
if(!ENABLED)
var1.sendMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED)));
else if(var2.length == 1)
if(VersionChecker.downloadedFile)
var1.sendMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setStyle(new Style().setColor(TextFormatting.RED)));
else if(VersionChecker.startedDownload)
var1.sendMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setStyle(new Style().setColor(TextFormatting.RED)));
else new ThreadDownloadMod("Botania " + var2[0] + ".jar");
}
}
@@ -10,54 +10,39 @@
*/
package vazkii.botania.common.core.command;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.command.CommandSource;
import net.minecraft.command.Commands;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.item.ItemLexicon;
import javax.annotation.Nonnull;
public class CommandOpen {
public class CommandOpen extends CommandBase {
@Nonnull
@Override
public String getName() {
return "botania-open";
public static void register(CommandDispatcher<CommandSource> dispatcher) {
dispatcher.register(
Commands.literal("botania-open")
.then(Commands.argument("entry", StringArgumentType.string())
.executes(CommandOpen::run))
);
}
@Nonnull
@Override
public String getUsage(@Nonnull ICommandSender sender) {
return "<entry>";
}
@Override
public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) {
if(sender instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) sender;
ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class);
if(!stack.isEmpty()) {
ItemLexicon.setForcedPage(stack, args[0]);
ItemLexicon.setQueueTicks(stack, 5);
} else sender.sendMessage(new TextComponentTranslation("botaniamisc.noLexicon").setStyle(new Style().setColor(TextFormatting.RED)));
private static int run(CommandContext<CommandSource> ctx) throws CommandSyntaxException {
EntityPlayerMP player = ctx.getSource().asPlayer();
ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class);
if(!stack.isEmpty()) {
ItemLexicon.setForcedPage(stack, StringArgumentType.getString(ctx, "entry"));
ItemLexicon.setQueueTicks(stack, 5);
return 1;
} else {
ctx.getSource().sendErrorMessage(new TextComponentTranslation("botaniamisc.noLexicon"));
return 0;
}
}
@Override
public int getRequiredPermissionLevel() {
return 0;
}
@Override
public boolean checkPermission(MinecraftServer server, ICommandSender sender) {
return sender instanceof EntityPlayer;
}
}
@@ -10,48 +10,33 @@
*/
package vazkii.botania.common.core.command;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.translation.I18n;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;
import net.minecraft.command.CommandSource;
import net.minecraft.command.Commands;
import javax.annotation.Nonnull;
public class CommandShare {
public class CommandShare extends CommandBase {
@Nonnull
@Override
public String getName() {
return "botania-share";
public static void register(CommandDispatcher<CommandSource> dispatcher) {
dispatcher.register(
Commands.literal("botania-share")
.then(Commands.argument("entry", StringArgumentType.string())
.executes(CommandShare::run))
);
}
@Nonnull
@Override
public String getUsage(@Nonnull ICommandSender sender) {
return "<entry>";
}
@Override
public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) {
private static int run(CommandContext<CommandSource> ctx) {
// todo 1.13
/*
String json = I18n.translateToLocal("botaniamisc.shareMsg");
json = json.replaceAll("%name%", sender.getName());
json = json.replaceAll("%entry%", args[0]);
json = json.replaceAll("%entryname%", I18n.translateToLocal(args[0]));
json = json.replaceAll("%entryname%", I18n.translateToLocal(StringArgumentType.getString(ctx, "entry")));
ITextComponent component = ITextComponent.Serializer.jsonToComponent(json);
server.getPlayerList().sendMessage(component);
}
@Override
public int getRequiredPermissionLevel() {
return 0;
}
@Override
public boolean checkPermission(MinecraftServer server, ICommandSender sender) {
return sender instanceof EntityPlayer;
ctx.getSource().getServer().getPlayerList().sendMessage(component);
*/
return 1;
}
}
@@ -10,64 +10,41 @@
*/
package vazkii.botania.common.core.command;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import net.minecraft.command.CommandSource;
import net.minecraft.command.Commands;
import net.minecraft.command.arguments.EntityArgument;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.translation.I18n;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.world.SkyblockWorldEvents;
import javax.annotation.Nonnull;
public class CommandSkyblockSpread {
private static final int DEFAULT_RANGE = 200000;
public class CommandSkyblockSpread extends CommandBase {
@Nonnull
@Override
public String getName() {
return "botania-skyblock-spread";
public static void register(CommandDispatcher<CommandSource> dispatcher) {
dispatcher.register(
Commands.literal("botania-skyblock-spread")
.requires(s -> s.hasPermissionLevel(2))
.then(Commands.argument("player", EntityArgument.player())
.then(Commands.argument("range", IntegerArgumentType.integer(250, 1000000))
.executes(ctx -> run(ctx.getSource().asPlayer(), IntegerArgumentType.getInteger(ctx, "range"))))
.executes(ctx -> run(ctx.getSource().asPlayer(), DEFAULT_RANGE)))
);
}
@Nonnull
@Override
public String getUsage(@Nonnull ICommandSender sender) {
return "<player> [<range>]";
}
@Override
public int getRequiredPermissionLevel() {
return 2;
}
@Override
public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args) throws CommandException {
int maxAllowed = 1000000;
int minAllowed = 250;
private static int run(EntityPlayerMP player, int range) {
int minDist = 100;
BlockPos spawn = player.world.getSpawnPoint();
int x, z;
int maxrange = 200000;
if(args.length == 2)
maxrange = parseInt(args[1]);
do {
x = player.world.rand.nextInt(range) - range / 2 + spawn.getX();
z = player.world.rand.nextInt(range) - range / 2 + spawn.getZ();
} while(MathHelper.pointDistancePlane(x, z, spawn.getX(), spawn.getZ()) < minDist);
if(maxrange > maxAllowed)
throw new CommandException("botaniamisc.skyblockRangeTooHigh");
if(maxrange < minAllowed)
throw new CommandException(I18n.translateToLocal("botaniamisc.skyblockRangeTooLow"));
EntityPlayer player = getPlayer(server, sender, args[0]);
if(player != null) {
BlockPos spawn = player.world.getSpawnPoint();
int x, z;
do {
x = player.world.rand.nextInt(maxrange) - maxrange / 2 + spawn.getX();
z = player.world.rand.nextInt(maxrange) - maxrange / 2 + spawn.getZ();
} while(MathHelper.pointDistancePlane(x, z, spawn.getX(), spawn.getZ()) < minDist);
SkyblockWorldEvents.spawnPlayer(player, new BlockPos(x, spawn.getY(), z), true);
}
SkyblockWorldEvents.spawnPlayer(player, new BlockPos(x, spawn.getY(), z), true);
return 1;
}
}
@@ -12,7 +12,7 @@ package vazkii.botania.common.core.version;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -36,20 +36,11 @@ import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumChest
import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm;
import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumLegs;
import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor;
import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelBoots;
import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelChest;
import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm;
import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelLegs;
import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveArmor;
import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveBoots;
import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveChest;
import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveHelm;
import vazkii.botania.common.item.equipment.armor.manaweave.ItemManaweaveLegs;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelArmor;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs;
import vazkii.botania.common.item.equipment.bauble.*;
import vazkii.botania.common.item.equipment.tool.ItemEnderDagger;
import vazkii.botania.common.item.equipment.tool.ItemGlassPick;
@@ -645,6 +636,7 @@ public final class ModItems {
}
private static void registerOreDictionary() {
/* todo 1.13
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
for(EnumDyeColor color : EnumDyeColor.values()) {
OreDictionary.registerOre(LibOreDict.PETAL[color.getMetadata()], new ItemStack(petals.get(color)));
@@ -717,5 +709,6 @@ public final class ModItems {
OreDictionary.registerOre("rodBlaze", Items.BLAZE_ROD);
OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER);
*/
}
}
@@ -13,7 +13,6 @@ package vazkii.botania.common.item.interaction.thaumcraft;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Optional;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm;
@@ -2,6 +2,9 @@
"__comment": "Items inside or resting on top of these blocks are not pulled by the ring of magnetization",
"replace": false,
"values": [
"botania:mana_pool",
"botania:creative_pool",
"botania:diluted_pool",
"botania:fabulous_pool"
]
}