Skip to content
This repository was archived by the owner on Jan 3, 2020. It is now read-only.

Commit 092bf79

Browse files
committed
bug fix
1 parent 997cbda commit 092bf79

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/org/devinprogress/autoharvest/AutoHarvest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import cpw.mods.fml.relauncher.Side;
1212
import net.minecraft.block.*;
1313
import net.minecraft.block.material.Material;
14+
import net.minecraft.client.Minecraft;
1415
import net.minecraft.client.multiplayer.PlayerControllerMP;
1516
import net.minecraft.client.settings.KeyBinding;
1617
import net.minecraft.entity.player.EntityPlayer;
@@ -35,15 +36,14 @@ public class AutoHarvest {
3536
private boolean harvestTick=true;
3637
private KeyBinding toggleKey=new KeyBinding("Toggle Enabled/Disabled", Keyboard.KEY_H,"Auto Harvest Mod");
3738
private static int harvestRange=1;
38-
private static PlayerControllerMP controller=null;
3939
private static final Set<Integer> grassBlockIds =new HashSet<Integer>(Arrays.asList(new Integer[]{
4040
6,31,32,37,38,39,40,175
4141
}));
42+
private Minecraft mc=null;
4243
private static final Set<Item> plantableItems=new HashSet<Item>(){{
4344
add(Items.wheat_seeds);
4445
add(Items.carrot);
4546
add(Items.potato);
46-
add(Items.poisonous_potato);
4747
add(Items.melon_seeds);
4848
add(Items.pumpkin_seeds);
4949
}};
@@ -76,7 +76,7 @@ public void onToggle(InputEvent.KeyInputEvent e){
7676
if(toggleKey.isPressed()){
7777
if(!enabled){
7878
enabled=true;
79-
controller=FMLClientHandler.instance().getClient().playerController;
79+
mc=FMLClientHandler.instance().getClient();
8080
sendPlayerPrivateMsg("[Auto Harvest] Enabled");
8181
}else{
8282
enabled=false;
@@ -103,26 +103,26 @@ public void onInGameTick(TickEvent.PlayerTickEvent e){//one block a tick
103103
private void doClearGrass(EntityPlayer p){
104104
World w=p.worldObj;
105105
int X=(int)Math.floor(p.posX);
106-
int Y=(int)Math.floor(p.posY-1.61);//the "leg block"
106+
int Y=(int)Math.floor(p.posY-1.45);//the "leg block"
107107
int Z=(int)Math.floor(p.posZ);
108108
for(int deltaY=-1;deltaY<=1;++deltaY)
109109
for(int deltaX=-2;deltaX<=2;++deltaX)
110110
for(int deltaZ=-2;deltaZ<=2;++deltaZ)
111111
if(canClearGrass(w,X + deltaX, Y+deltaY, Z + deltaZ)){
112-
controller.onPlayerDamageBlock(X + deltaX, Y+deltaY, Z + deltaZ, 1);
112+
mc.playerController.onPlayerDamageBlock(X + deltaX, Y+deltaY, Z + deltaZ, 1);
113113
return;
114114
}
115115
}
116116

117117
private void doHarvest(EntityPlayer p){
118118
World w=p.worldObj;
119119
int X=(int)Math.floor(p.posX);
120-
int Y=(int)Math.floor(p.posY-1.61);//the "leg block"
120+
int Y=(int)Math.floor(p.posY-1.45);//the "leg block"
121121
int Z=(int)Math.floor(p.posZ);
122122
for(int deltaX=-harvestRange;deltaX<=harvestRange;++deltaX)
123123
for(int deltaZ=-harvestRange;deltaZ<=harvestRange;++deltaZ){
124124
if(canHarvest(w,p,X+deltaX,Y,Z+deltaZ)) {
125-
controller.onPlayerDamageBlock(X + deltaX, Y, Z + deltaZ, 1);
125+
mc.playerController.onPlayerDamageBlock(X + deltaX, Y, Z + deltaZ, 1);
126126
return;
127127
}
128128
}
@@ -131,13 +131,13 @@ private void doHarvest(EntityPlayer p){
131131
private void doPlant(EntityPlayer p){
132132
World w=p.worldObj;
133133
int X=(int)Math.floor(p.posX);
134-
int Y=(int)Math.floor(p.posY-2.61);//Block player stand on;
134+
int Y=(int)Math.floor(p.posY-2.45);//Block player stand on;
135135
int Z=(int)Math.floor(p.posZ);
136136
for(int deltaX=-harvestRange;deltaX<=harvestRange;++deltaX)
137137
for(int deltaZ=-harvestRange;deltaZ<=harvestRange;++deltaZ){
138138
if(canPlantOn(w, p,X + deltaX, Y, Z + deltaZ)) {
139-
ItemStack seed=FMLClientHandler.instance().getClient().thePlayer.inventory.getCurrentItem();
140-
controller.onPlayerRightClick(p,w,seed,X + deltaX, Y, Z + deltaZ,1,
139+
ItemStack seed=mc.thePlayer.inventory.getCurrentItem();
140+
mc.playerController.onPlayerRightClick(p,w,seed,X + deltaX, Y, Z + deltaZ,1,
141141
Vec3.createVectorHelper(X + deltaX+0.5, Y+1, Z + deltaZ+0.5));
142142
return;
143143
}

0 commit comments

Comments
 (0)