Skip to content

Auto-replant one of the falling sapling dropped on the ground after a tree is chopped #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 2 commits into
base: 1.7.10
Choose a base branch
from
Open

Auto-replant one of the falling sapling dropped on the ground after a tree is chopped #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d078a89
first pass on 1.8 changes
bspkrs Feb 19, 2015
e6a946b
1.8 update
bspkrs Apr 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ archivesBaseName = "[${config.minecraft_version}]${config.mod_id}"
minecraft {
version = config.minecraft_version + "-" + config.forge_version // grab latest forge
mappings = config.mappings_version
assetDir = "run/assets"
runDir = "run"
replace '@MOD_VERSION@', version
replace '@BSCORE_VERSION@', config.bscore_version
}
Expand Down
10 changes: 5 additions & 5 deletions build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
minecraft_version=1.7.10
forge_version=10.13.2.1232
mappings_version=stable_12
mod_version=2.0.4
bscore_version=6.15
minecraft_version=1.8
forge_version=11.14.1.1334
mappings_version=stable_16
mod_version=2.0.5
bscore_version=7.01
mod_id=Treecapitator
group_name=treecapitator
appendix=universal
6 changes: 3 additions & 3 deletions src/main/java/bspkrs/treecapitator/ClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import net.minecraftforge.common.config.Configuration;
import bspkrs.treecapitator.config.TCSettings;
import bspkrs.treecapitator.fml.gui.GuiConfigCustomCategoryListEntry;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/bspkrs/treecapitator/CommonProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
import bspkrs.treecapitator.network.TCPacketConfig;
import bspkrs.treecapitator.network.TCPacketLogin;
import bspkrs.treecapitator.util.TCLog;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
import cpw.mods.fml.common.network.FMLOutboundHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.relauncher.Side;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import net.minecraftforge.fml.common.network.FMLEmbeddedChannel;
import net.minecraftforge.fml.common.network.FMLOutboundHandler;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.relauncher.Side;

public class CommonProxy
{
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/bspkrs/treecapitator/EnchantmentTreecapitating.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import bspkrs.treecapitator.config.TCSettings;
import bspkrs.treecapitator.registry.ToolRegistry;

public class EnchantmentTreecapitating extends Enchantment
{
public EnchantmentTreecapitating(int par1, int par2)
{
super(par1, par2, EnumEnchantmentType.digger);
super(par1, new ResourceLocation("treecapitating"), par2, EnumEnchantmentType.DIGGER);
}

@Override
Expand Down Expand Up @@ -48,7 +49,7 @@ public int getMaxLevel()
@Override
public boolean canApplyTogether(Enchantment enchantment)
{
return TCSettings.enableEnchantmentMode && super.canApplyTogether(enchantment) && enchantment.effectId != fortune.effectId;
return TCSettings.enableEnchantmentMode && super.canApplyTogether(enchantment) && (enchantment.effectId != fortune.effectId);
}

}
14 changes: 7 additions & 7 deletions src/main/java/bspkrs/treecapitator/TCClientTicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import net.minecraft.client.Minecraft;
import net.minecraft.util.ChatComponentText;
import bspkrs.bspkrscore.fml.bspkrsCoreMod;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

@SideOnly(Side.CLIENT)
public class TCClientTicker
Expand Down
Loading