mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 03:39:09 +00:00
Revert "Use generics for Chromosome type, begin unifying code"
This reverts commit 43e41034f6.
Conflicts:
src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
src/main/java/forestry/core/proxy/ProxyRenderClient.java
This commit is contained in:
1 parent
87f2dc0a0a
commit
efcab41e04
217 files changed
+2408
-3136
No files matched your search
@@ -10,7 +10,6 @@
|
||||
******************************************************************************/
|
||||
package forestry.farming.multiblock;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -297,7 +296,7 @@ public class FarmController extends RectangularMultiblockControllerBase implemen
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(@Nonnull NBTTagCompound data) {
|
||||
public void writeToNBT(NBTTagCompound data) {
|
||||
super.writeToNBT(data);
|
||||
sockets.writeToNBT(data);
|
||||
hydrationManager.writeToNBT(data);
|
||||
|
||||
Reference in new issue
Block a user