mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-26 08:48:34 +01:00
The "I didn't think it would annoy people that much"-Update 0.0.9.2
This commit is contained in:
parent
716a19596d
commit
183028d00b
9 changed files with 149 additions and 11 deletions
|
@ -18,7 +18,7 @@ buildscript {
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
|
|
||||||
version = "1.7.10-0.0.9.1"
|
version = "1.7.10-0.0.9.2"
|
||||||
group = "ellpeck.actuallyadditions"
|
group = "ellpeck.actuallyadditions"
|
||||||
archivesBaseName = "ActuallyAdditions"
|
archivesBaseName = "ActuallyAdditions"
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.actuallyadditions.items.InitForeignPaxels;
|
import ellpeck.actuallyadditions.items.InitForeignPaxels;
|
||||||
import ellpeck.actuallyadditions.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.actuallyadditions.items.ItemCoffee;
|
import ellpeck.actuallyadditions.items.ItemCoffee;
|
||||||
import ellpeck.actuallyadditions.items.tools.table.InitToolTableTools;
|
|
||||||
import ellpeck.actuallyadditions.material.InitArmorMaterials;
|
import ellpeck.actuallyadditions.material.InitArmorMaterials;
|
||||||
import ellpeck.actuallyadditions.material.InitToolMaterials;
|
import ellpeck.actuallyadditions.material.InitToolMaterials;
|
||||||
import ellpeck.actuallyadditions.misc.DispenserHandlerEmptyBucket;
|
import ellpeck.actuallyadditions.misc.DispenserHandlerEmptyBucket;
|
||||||
|
@ -99,7 +98,7 @@ public class ActuallyAdditions{
|
||||||
HairyBallHandler.init();
|
HairyBallHandler.init();
|
||||||
TreasureChestHandler.init();
|
TreasureChestHandler.init();
|
||||||
InitForeignPaxels.init();
|
InitForeignPaxels.init();
|
||||||
InitToolTableTools.init();
|
//InitToolTableTools.init();
|
||||||
proxy.postInit(event);
|
proxy.postInit(event);
|
||||||
|
|
||||||
ModUtil.LOGGER.info("PostInitialization Finished.");
|
ModUtil.LOGGER.info("PostInitialization Finished.");
|
||||||
|
|
|
@ -93,13 +93,13 @@ public class InitBlocks{
|
||||||
|
|
||||||
public static Block blockSmileyCloud;
|
public static Block blockSmileyCloud;
|
||||||
|
|
||||||
public static Block blockToolTable;
|
//public static Block blockToolTable;
|
||||||
|
|
||||||
public static void init(){
|
public static void init(){
|
||||||
ModUtil.LOGGER.info("Initializing Blocks...");
|
ModUtil.LOGGER.info("Initializing Blocks...");
|
||||||
|
|
||||||
blockToolTable = new BlockToolTable();
|
//blockToolTable = new BlockToolTable();
|
||||||
BlockUtil.register(blockToolTable);
|
//BlockUtil.register(blockToolTable);
|
||||||
|
|
||||||
blockSmileyCloud = new BlockSmileyCloud();
|
blockSmileyCloud = new BlockSmileyCloud();
|
||||||
BlockUtil.register(blockSmileyCloud);
|
BlockUtil.register(blockSmileyCloud);
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class TooltipEvent{
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(ConfigBoolValues.SHOW_NEED_BOOKLET_FOR_KEYBIND_INFO.isEnabled()){
|
if(ConfigBoolValues.SHOW_NEED_BOOKLET_FOR_KEYBIND_INFO.isEnabled()){
|
||||||
event.toolTip.addAll(Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(EnumChatFormatting.DARK_RED+StringUtil.localizeFormatted("booklet."+ModUtil.MOD_ID_LOWER+".noBookletInInventory"), GuiBooklet.TOOLTIP_SPLIT_LENGTH));
|
event.toolTip.addAll(Minecraft.getMinecraft().fontRenderer.listFormattedStringToWidth(EnumChatFormatting.ITALIC+StringUtil.localizeFormatted("booklet."+ModUtil.MOD_ID_LOWER+".noBookletInInventory"), GuiBooklet.TOOLTIP_SPLIT_LENGTH));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -0,0 +1,139 @@
|
||||||
|
/*
|
||||||
|
* This file ("ItemLumberAxe.java") is part of the Actually Additions Mod for Minecraft.
|
||||||
|
* It is created and owned by Ellpeck and distributed
|
||||||
|
* under the Actually Additions License to be found at
|
||||||
|
* http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
|
||||||
|
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
|
||||||
|
*
|
||||||
|
* © 2015 Ellpeck
|
||||||
|
*/
|
||||||
|
|
||||||
|
package ellpeck.actuallyadditions.items.tools.table;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
import ellpeck.actuallyadditions.items.tools.ItemAxeAA;
|
||||||
|
import ellpeck.actuallyadditions.util.ModUtil;
|
||||||
|
import ellpeck.actuallyadditions.util.StringUtil;
|
||||||
|
import ellpeck.actuallyadditions.util.WorldPos;
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.item.EnumRarity;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.IIcon;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
public class ItemLumberAxe extends ItemAxeAA implements IToolTableRepairItem{
|
||||||
|
|
||||||
|
private final int maxToolDamage;
|
||||||
|
|
||||||
|
private ItemStack repairStack;
|
||||||
|
private int repairPerStack;
|
||||||
|
|
||||||
|
private IIcon iconBroken;
|
||||||
|
|
||||||
|
public ItemLumberAxe(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity, ItemStack repairStack, int repairPerStack){
|
||||||
|
super(toolMat, "", unlocalizedName, rarity);
|
||||||
|
this.maxToolDamage = this.getMaxDamage();
|
||||||
|
this.setMaxDamage(this.maxToolDamage+1);
|
||||||
|
this.repairStack = repairStack;
|
||||||
|
this.repairPerStack = repairPerStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player){
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ArrayList<WorldPos> getTreeBlocksToBreak(World world, int startX, int startY, int startZ){
|
||||||
|
ArrayList<WorldPos> positions = new ArrayList<WorldPos>();
|
||||||
|
int range = 3;
|
||||||
|
for(int x = -range; x < range+1; x++){
|
||||||
|
for(int z = -range; z < range+1; z++){
|
||||||
|
for(int y = -range; y < range+1; y++){
|
||||||
|
int theX = startX+x;
|
||||||
|
int theY = startY+y;
|
||||||
|
int theZ = startZ+z;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return positions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isBroken(ItemStack stack){
|
||||||
|
return this.isBroken(stack.getItemDamage());
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isBroken(int damage){
|
||||||
|
return damage > this.maxToolDamage;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasEffect(ItemStack stack, int pass){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isRepairable(){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean getIsRepairable(ItemStack stack1, ItemStack stack2){
|
||||||
|
return this.isRepairable();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemEnchantability(ItemStack stack){
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getItemStackDisplayName(ItemStack stack){
|
||||||
|
return super.getItemStackDisplayName(stack)+(this.isBroken(stack) ? " ("+StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".broken.desc")+")" : "");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getDigSpeed(ItemStack stack, Block block, int meta){
|
||||||
|
return this.isBroken(stack) ? 0.0F : super.getDigSpeed(stack, block, meta);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canHarvestBlock(Block block, ItemStack stack){
|
||||||
|
return !this.isBroken(stack) && super.canHarvestBlock(block, stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack useItem, int useRemaining){
|
||||||
|
return this.isBroken(stack) ? this.iconBroken : this.itemIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public IIcon getIconFromDamage(int damage){
|
||||||
|
return this.isBroken(damage) ? this.iconBroken : this.itemIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public void registerIcons(IIconRegister iconReg){
|
||||||
|
this.iconBroken = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Broken");
|
||||||
|
this.itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getRepairStack(){
|
||||||
|
return this.repairStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int repairPerStack(){
|
||||||
|
return this.repairPerStack;
|
||||||
|
}
|
||||||
|
}
|
|
@ -71,7 +71,7 @@ public class TileEntityBase extends TileEntity{
|
||||||
GameRegistry.registerTileEntity(TileEntityXPSolidifier.class, ModUtil.MOD_ID_LOWER+":tileEntityXPSolidifier");
|
GameRegistry.registerTileEntity(TileEntityXPSolidifier.class, ModUtil.MOD_ID_LOWER+":tileEntityXPSolidifier");
|
||||||
GameRegistry.registerTileEntity(TileEntityOreMagnet.class, ModUtil.MOD_ID_LOWER+":tileEntityOreMagnet");
|
GameRegistry.registerTileEntity(TileEntityOreMagnet.class, ModUtil.MOD_ID_LOWER+":tileEntityOreMagnet");
|
||||||
GameRegistry.registerTileEntity(TileEntitySmileyCloud.class, ModUtil.MOD_ID_LOWER+":tileEntityCloud");
|
GameRegistry.registerTileEntity(TileEntitySmileyCloud.class, ModUtil.MOD_ID_LOWER+":tileEntityCloud");
|
||||||
GameRegistry.registerTileEntity(TileEntityToolTable.class, ModUtil.MOD_ID_LOWER+":tileEntityToolTable");
|
//GameRegistry.registerTileEntity(TileEntityToolTable.class, ModUtil.MOD_ID_LOWER+":tileEntityToolTable");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -15,7 +15,7 @@ import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class ModUtil{
|
public class ModUtil{
|
||||||
|
|
||||||
public static final String VERSION = "1.7.10-0.0.9.1";
|
public static final String VERSION = "1.7.10-0.0.9.2";
|
||||||
|
|
||||||
public static final String MOD_ID = "ActuallyAdditions";
|
public static final String MOD_ID = "ActuallyAdditions";
|
||||||
public static final String NAME = "Actually Additions";
|
public static final String NAME = "Actually Additions";
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Added the Actually Additions Manual with everything you need to know awesomely organized!
|
Made the ActAdd Manual Tooltip more subtle, added better coffee machine pages into the book
|
|
@ -1 +1 @@
|
||||||
1.7.10-0.0.9.1
|
1.7.10-0.0.9.2
|
Loading…
Reference in a new issue