Move getSeedItem() above shouldHarvestByMining()

Alexander01998 · Alexander01998 · commit ac0d3df9aab8 · 2025-11-01T14:16:51.000+01:00
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/AmethystPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/AmethystPlantType.java
@@ -30,15 +30,15 @@ public final boolean hasPlantingSurface(BlockPos pos)
 	}
 	
 	@Override
-	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
+	public Item getSeedItem()
 	{
-		return state.isOf(Blocks.AMETHYST_CLUSTER);
+		return Items.BUDDING_AMETHYST;
 	}
 	
 	@Override
-	public Item getSeedItem()
+	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
-		return Items.BUDDING_AMETHYST;
+		return state.isOf(Blocks.AMETHYST_CLUSTER);
 	}
 	
 	@Override
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/BambooPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/BambooPlantType.java
@@ -40,6 +40,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 			.isIn(BlockTags.BAMBOO_PLANTABLE_ON);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.BAMBOO;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -50,12 +56,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return isReplantingSpot(below, BlockUtils.getState(below));
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.BAMBOO;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/BeetrootsPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/BeetrootsPlantType.java
@@ -31,6 +31,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return BlockUtils.getState(pos.down()).isOf(Blocks.FARMLAND);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.BEETROOT_SEEDS;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -40,12 +46,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return beetroots.isMature(state);
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.BEETROOT_SEEDS;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/CactusPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/CactusPlantType.java
@@ -46,6 +46,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 				|| neighbor.getFluidState().isIn(FluidTags.LAVA));
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.CACTUS;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -56,12 +62,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return isReplantingSpot(below, BlockUtils.getState(below));
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.CACTUS;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/CarrotsPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/CarrotsPlantType.java
@@ -31,6 +31,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return BlockUtils.getState(pos.down()).isOf(Blocks.FARMLAND);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.CARROT;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -40,12 +46,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return carrots.isMature(state);
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.CARROT;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/CocoaBeanPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/CocoaBeanPlantType.java
@@ -34,6 +34,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 			.anyMatch(neighbor -> neighbor.isIn(BlockTags.JUNGLE_LOGS));
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.COCOA_BEANS;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -43,12 +49,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return state.get(CocoaBlock.AGE) >= CocoaBlock.MAX_AGE;
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.COCOA_BEANS;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/KelpPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/KelpPlantType.java
@@ -48,6 +48,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 			.isSideSolidFullSquare(WurstClient.MC.world, pos, Direction.UP);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.KELP;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -58,12 +64,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return isReplantingSpot(below, BlockUtils.getState(below));
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.KELP;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/MelonPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/MelonPlantType.java
@@ -32,15 +32,15 @@ public final boolean hasPlantingSurface(BlockPos pos)
 	}
 	
 	@Override
-	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
+	public Item getSeedItem()
 	{
-		return state.isOf(Blocks.MELON);
+		return Items.MELON_SEEDS;
 	}
 	
 	@Override
-	public Item getSeedItem()
+	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
-		return Items.MELON_SEEDS;
+		return state.isOf(Blocks.MELON);
 	}
 	
 	@Override
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/NetherWartPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/NetherWartPlantType.java
@@ -31,6 +31,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return BlockUtils.getState(pos.down()).isOf(Blocks.SOUL_SAND);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.NETHER_WART;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -40,12 +46,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return state.get(NetherWartBlock.AGE) >= NetherWartBlock.MAX_AGE;
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.NETHER_WART;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/PotatoesPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/PotatoesPlantType.java
@@ -31,6 +31,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return BlockUtils.getState(pos.down()).isOf(Blocks.FARMLAND);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.POTATO;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -40,12 +46,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return potato.isMature(state);
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.POTATO;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/PumpkinPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/PumpkinPlantType.java
@@ -32,15 +32,15 @@ public final boolean hasPlantingSurface(BlockPos pos)
 	}
 	
 	@Override
-	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
+	public Item getSeedItem()
 	{
-		return state.isOf(Blocks.PUMPKIN);
+		return Items.PUMPKIN_SEEDS;
 	}
 	
 	@Override
-	public Item getSeedItem()
+	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
-		return Items.PUMPKIN_SEEDS;
+		return state.isOf(Blocks.PUMPKIN);
 	}
 	
 	@Override
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/SugarCanePlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/SugarCanePlantType.java
@@ -52,6 +52,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return false;
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.SUGAR_CANE;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -62,12 +68,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return isReplantingSpot(below, BlockUtils.getState(below));
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.SUGAR_CANE;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/SweetBerryPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/SweetBerryPlantType.java
@@ -34,6 +34,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return floor.isIn(BlockTags.DIRT) || floor.isOf(Blocks.FARMLAND);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.SWEET_BERRIES;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -49,12 +55,6 @@ public boolean shouldHarvestByInteracting(BlockPos pos, BlockState state)
 		return state.get(SweetBerryBushBlock.AGE) > 1;
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.SWEET_BERRIES;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{
diff --git a/src/main/java/net/wurstclient/hacks/autofarm/plants/WheatPlantType.java b/src/main/java/net/wurstclient/hacks/autofarm/plants/WheatPlantType.java
@@ -31,6 +31,12 @@ public final boolean hasPlantingSurface(BlockPos pos)
 		return BlockUtils.getState(pos.down()).isOf(Blocks.FARMLAND);
 	}
 	
+	@Override
+	public Item getSeedItem()
+	{
+		return Items.WHEAT_SEEDS;
+	}
+	
 	@Override
 	public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 	{
@@ -40,12 +46,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)
 		return crop.isMature(state) && state.isOf(Blocks.WHEAT);
 	}
 	
-	@Override
-	public Item getSeedItem()
-	{
-		return Items.WHEAT_SEEDS;
-	}
-	
 	@Override
 	protected CheckboxSetting createHarvestSetting()
 	{

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
`33`		`- public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
	`33`	`+ public Item getSeedItem()`
`34`	`34`	`{`
`35`		`- return state.isOf(Blocks.AMETHYST_CLUSTER);`
	`35`	`+ return Items.BUDDING_AMETHYST;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Override`
`39`		`- public Item getSeedItem()`
	`39`	`+ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`40`	`40`	`{`
`41`		`- return Items.BUDDING_AMETHYST;`
	`41`	`+ return state.isOf(Blocks.AMETHYST_CLUSTER);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`40`	`40`	`.isIn(BlockTags.BAMBOO_PLANTABLE_ON);`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ @Override`
	`44`	`+ public Item getSeedItem()`
	`45`	`+ {`
	`46`	`+ return Items.BAMBOO;`
	`47`	`+ }`
	`48`	`+`
`43`	`49`	`@Override`
`44`	`50`	`public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`45`	`51`	`{`
`@@ -50,12 +56,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`50`	`56`	`return isReplantingSpot(below, BlockUtils.getState(below));`
`51`	`57`	`}`
`52`	`58`
`53`		`- @Override`
`54`		`- public Item getSeedItem()`
`55`		`- {`
`56`		`- return Items.BAMBOO;`
`57`		`- }`
`58`		`-`
`59`	`59`	`@Override`
`60`	`60`	`protected CheckboxSetting createHarvestSetting()`
`61`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,12 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`31`	`31`	`return BlockUtils.getState(pos.down()).isOf(Blocks.FARMLAND);`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ @Override`
	`35`	`+ public Item getSeedItem()`
	`36`	`+ {`
	`37`	`+ return Items.BEETROOT_SEEDS;`
	`38`	`+ }`
	`39`	`+`
`34`	`40`	`@Override`
`35`	`41`	`public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`36`	`42`	`{`
`@@ -40,12 +46,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`40`	`46`	`return beetroots.isMature(state);`
`41`	`47`	`}`
`42`	`48`
`43`		`- @Override`
`44`		`- public Item getSeedItem()`
`45`		`- {`
`46`		`- return Items.BEETROOT_SEEDS;`
`47`		`- }`
`48`		`-`
`49`	`49`	`@Override`
`50`	`50`	`protected CheckboxSetting createHarvestSetting()`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,12 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`46`	`46`	`\|\| neighbor.getFluidState().isIn(FluidTags.LAVA));`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ @Override`
	`50`	`+ public Item getSeedItem()`
	`51`	`+ {`
	`52`	`+ return Items.CACTUS;`
	`53`	`+ }`
	`54`	`+`
`49`	`55`	`@Override`
`50`	`56`	`public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`51`	`57`	`{`
`@@ -56,12 +62,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`56`	`62`	`return isReplantingSpot(below, BlockUtils.getState(below));`
`57`	`63`	`}`
`58`	`64`
`59`		`- @Override`
`60`		`- public Item getSeedItem()`
`61`		`- {`
`62`		`- return Items.CACTUS;`
`63`		`- }`
`64`		`-`
`65`	`65`	`@Override`
`66`	`66`	`protected CheckboxSetting createHarvestSetting()`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,12 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`34`	`34`	`.anyMatch(neighbor -> neighbor.isIn(BlockTags.JUNGLE_LOGS));`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ @Override`
	`38`	`+ public Item getSeedItem()`
	`39`	`+ {`
	`40`	`+ return Items.COCOA_BEANS;`
	`41`	`+ }`
	`42`	`+`
`37`	`43`	`@Override`
`38`	`44`	`public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`39`	`45`	`{`
`@@ -43,12 +49,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`43`	`49`	`return state.get(CocoaBlock.AGE) >= CocoaBlock.MAX_AGE;`
`44`	`50`	`}`
`45`	`51`
`46`		`- @Override`
`47`		`- public Item getSeedItem()`
`48`		`- {`
`49`		`- return Items.COCOA_BEANS;`
`50`		`- }`
`51`		`-`
`52`	`52`	`@Override`
`53`	`53`	`protected CheckboxSetting createHarvestSetting()`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,12 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`48`	`48`	`.isSideSolidFullSquare(WurstClient.MC.world, pos, Direction.UP);`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ @Override`
	`52`	`+ public Item getSeedItem()`
	`53`	`+ {`
	`54`	`+ return Items.KELP;`
	`55`	`+ }`
	`56`	`+`
`51`	`57`	`@Override`
`52`	`58`	`public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`53`	`59`	`{`
`@@ -58,12 +64,6 @@ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`58`	`64`	`return isReplantingSpot(below, BlockUtils.getState(below));`
`59`	`65`	`}`
`60`	`66`
`61`		`- @Override`
`62`		`- public Item getSeedItem()`
`63`		`- {`
`64`		`- return Items.KELP;`
`65`		`- }`
`66`		`-`
`67`	`67`	`@Override`
`68`	`68`	`protected CheckboxSetting createHarvestSetting()`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ public final boolean hasPlantingSurface(BlockPos pos)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
`35`		`- public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
	`35`	`+ public Item getSeedItem()`
`36`	`36`	`{`
`37`		`- return state.isOf(Blocks.MELON);`
	`37`	`+ return Items.MELON_SEEDS;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`41`		`- public Item getSeedItem()`
	`41`	`+ public boolean shouldHarvestByMining(BlockPos pos, BlockState state)`
`42`	`42`	`{`
`43`		`- return Items.MELON_SEEDS;`
	`43`	`+ return state.isOf(Blocks.MELON);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`