diff --git a/.gitignore b/.gitignore index 5df71aab6..d4e756478 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,28 @@ -.classpath -.gradle/ -.nb-gradle/ -.settings/ -build/ -eclipse/ -.project +# ForgeGradle +/.gradle +/.nb-gradle +/build +/eclipse +/libs +/run gradle.properties + +# Eclipse +.classpath +.project +/.settings +/bin + +# IntelliJ +/.idea +*.iml +*.ipr +*.iws +/out + +# Mac Stuff +.DS_Store +*.command + +# Other *~ diff --git a/api b/api index b061b02c7..a40296218 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit b061b02c79453b9a45a8da30cdadbf447d7f65e4 +Subproject commit a402962180eaefc62ef50f2b2df4b6140413a12f diff --git a/build.gradle b/build.gradle index 9eff674a6..b90a1b73e 100755 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ ext.CraftGuideTmp = "build/tmp/CraftGuide" minecraft { version = mcversion + "-" + forgeversion - assetDir = "eclipse/assets" + runDir = "run" replace '@VERSION@', project.version replace '@BUILD_NUMBER@', getBuildNumber() @@ -51,13 +51,9 @@ sourceSets { main { java { - srcDirs file('forestry_common').listFiles() - include 'forestry/**' - srcDir project.dirApi } resources { - srcDir 'forestry_resources' srcDir project.dirLang } } @@ -76,11 +72,16 @@ configurations { } dependencies { - compile 'net.industrial-craft:industrialcraft-2:2.2.508-experimental:api' - buildcraft 'com.mod-buildcraft:buildcraft:5.0.4.2942:dev' + compile 'net.industrial-craft:industrialcraft-2:2.2.575-experimental:api' + buildcraft 'com.mod-buildcraft:buildcraft:6.0.17:dev' } processResources { + + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' @@ -172,7 +173,7 @@ jar { destinationDir = file("build/tmp") archiveName = "main.jar" - from { + from { configurations.buildcraft.collect { it.isDirectory() ? it : zipTree(it).matching { include '**/api/**' diff --git a/forestry_resources/lang/forestry/apiculture/en_US.properties b/forestry_resources/lang/forestry/apiculture/en_US.properties deleted file mode 100755 index 624a0f8ff..000000000 --- a/forestry_resources/lang/forestry/apiculture/en_US.properties +++ /dev/null @@ -1,163 +0,0 @@ - -apiculture.effect.aggressive=Aggress. -apiculture.effect.beatific=Beatific -apiculture.effect.creeper=Creeper -apiculture.effect.exploration=Explorer -apiculture.effect.glacial=Freezing -apiculture.effect.heroic=Heroic -apiculture.effect.ignition=Flammable -apiculture.effect.misasmic=Poison -apiculture.effect.misanthrope=Ends -apiculture.effect.radioactive=Radioact. -apiculture.effect.drunkard=Drunkard -apiculture.effect.snowing=Snow -apiculture.effect.resurrection=Resurrection -apiculture.effect.reanimation=Reanimation -apiculture.effect.repulsion=Repulsion -bees.hybrid.adj.add= -bees.hyphen.adj.add= -bees.drone=Drone -bees.drone.adj.add= -bees.larvae=Larvae -bees.larvae.adj.add= -bees.princess=Princess -bees.princess.adj.add= -bees.queen=Queen -bees.queen.adj.add= -bees.stock.pristine=Pristine Stock -bees.stock.ignoble=Ignoble Stock -death.bee.end=%1$s was ended by an unfriendly sting. -death.bee.end.player=%1$s was ended by an unfriendly sting while fighting %2$s. -death.bee.radioactive=%1$s walked into Chernobyl without his helmet on. -death.bee.radioactive.player=%1$s walked into Chernobyl without his helmet on. %2$s watched and cackled. -death.bee.aggressive=%1$s encountered a swarm of bees. That had to sting. -death.bee.aggressive.player=%1$s encountered a swarm of bees. %2$s stole his apiarist's suit. -genus.bees.common=Common -genus.bees.noble=Noble -genus.bees.industrious=Industrious -genus.bees.heroic=Heroic -genus.bees.infernal=Infernal -genus.bees.austere=Austere -genus.bees.end=End -genus.bees.vengeful=Vengeful -genus.bees.tropical=Tropical -genus.bees.frozen=Frozen -genus.bees.reddened=Reddened -genus.bees.festive=Festive -genus.bees.agrarian=Agrarian -genus.bees.boggy=Boggy -genus.bees.monastic=Monastic -bees.species.forest=Forest -bees.species.meadows=Meadows -bees.species.common=Common -bees.species.cultivated=Cultivated -bees.species.noble=Noble -bees.species.majestic=Majestic -bees.species.imperial=Imperial -bees.species.diligent=Diligent -bees.species.unweary=Unweary -bees.species.industrious=Industrious -bees.species.steadfast=Steadfast -bees.species.valiant=Valiant -bees.species.heroic=Heroic -bees.species.sinister=Sinister -bees.species.fiendish=Fiendish -bees.species.demonic=Demonic -bees.species.modest=Modest -bees.species.frugal=Frugal -bees.species.austere=Austere -bees.species.tropical=Tropical -bees.species.exotic=Exotic -bees.species.edenic=Edenic -bees.species.ender=Ender -bees.species.wintry=Wintry -bees.species.icy=Icy -bees.species.glacial=Glacial -bees.species.vindictive=Vindictive -bees.species.vengeful=Vengeful -bees.species.avenging=Avenging -bees.species.darkened=Darkened -bees.species.reddened=Reddened -bees.species.omega=Omega -bees.species.leporine=Leporine -bees.species.tricky=Tricky -bees.species.rural=Rural -bees.species.marshy=Marshy -bees.species.merry=Merry -bees.species.tipsy=Tipsy -bees.species.monastic=Monastic -bees.species.secluded=Secluded -bees.species.hermitic=Hermitic -bees.species.spectral=Spectral -bees.species.phantasmal=Phantasmal -beemode.easy.desc=Simplifies beebreeding by drastically increasing mutation rate and removing the chance for genetic fatigue. -beemode.normal.desc=Recommended mode for the normal player. -beemode.hard.desc=Reducing mutation rate slightly while increasing lifespan of individual queens by 50 %. -beemode.hardcore.desc=Halves mutation rate, increases lifespan of individual queens by 500 % and reduces fertility by 20 %. -beemode.insane.desc=Cuts mutation rate to 20 %, increases lifespan tenfold and reduces fertility by 40 %. -description.speciesForest=One of the most common pests in forests; Mostly docile.|Beekeeping 101 -description.speciesMeadows=Infests mostly plains in temperate climates; Mostly docile.|Beekeeping 101 -description.speciesCommon=Considered the beginner apiarist's badge of participation.|Beekeeping 101 -description.speciesCultivated=Fast working bee; Thinks anything but opera is beneath it.|Beekeeping 101 -description.speciesNoble="There is no more noble occupation in the world than to breed another bee."|Binnie, Apiarist -description.speciesMajestic="Off with their heads!"|Queen of Hearts -description.speciesImperial=Highly sought after bee; Specialises in the production of precious royal jelly.|Beekeeping 101 -description.speciesDiligent=Mostly noted as a stepping stone for the industrious line of bees.|Beekeeping 101 -description.speciesUnweary=Unweary. Then they die.|Beekeeping 101 -description.speciesIndustrious=Highly sought after bee; Specialises in the production of exquisite pollen.|Beekeeping 101 -description.speciesSteadfast=Considered extinct until some were found by adventurers in a deep dungeon.|Apiarist's Grimoire -description.speciesValiant=A rare subspecies rarely seen cohabiting in mundane hives.|Apiarist's Grimoire -description.speciesHeroic=Elaborate legends have surrounded this species. Will defend its hive to its death against any hostiles.|Apiarist's Grimoire -description.speciesSinister=Not many bee species are able to survive in the nether. And even those are severly affected by their hellish environment.|Beekeeping 101 -description.speciesFiendish=Experienced nether apiarist's have been reporting severe attacks by their bees. Caution is advised.|Beekeeping 101 -description.speciesDemonic=Born in the fires of the nether and being a descendant of generations of nether bees has caused this species to turn into a true demon.|Beekeeping 101 -description.speciesModest=Hot and arid climates have forced this species to adapt to a degree which will not allow it to survive in significantly friendlier climates.|Beekeeping 101 -description.speciesFrugal=Generations of bees baked in the sun to produce this species.|Beekeeping 101 -description.speciesAustere=Dangerous and volatile; Beekeepers are advised to stay in full suit whenever near.|Beekeeping 101 -description.speciesTropical="My travels along the jungle river allowed me to catch many of these poisonous specimen. Unfortunately I had lost my only austere branch to crocodiles a while back."|Beekeeping 101 -description.speciesExotic="The fever shook me and my apiarist's suit was drenched with cold sweat, but with trembling hands I finally managed to pull one of these from my apiary."|Beekeeping 101 -description.speciesEdenic="I furiously scribbled in my notebook, drawing sketches of the images I felt seeping into my brain while I was watching the insects perform their strange little dance."|Beekeeping 101 -description.speciesWintry=Common, but winter-hardened bee tribe; Cultivation in warmer climates is a challenge.|Beekeeping 101 -description.speciesIcy=Temperatures inside hives inhabited by this species will drop until ice shards form.|Beekeeping 101 -description.speciesGlacial="Winter is coming!"|E. Stark, beekeeper -description.speciesVindictive="It ate my face! It ate my face!"|K.M. -description.speciesVengeful="Veni, vidi, vici!"|Apinus Julius Caesar -description.speciesAvenging="The walls of my house began to crumble and I heard the roof creaking over my head, but I cared not! I felt the stabs of a thousand little insects on my glove as I grabbed the new queen."|Anonymous -description.speciesDarkened=Attracted by the power of alchemically bound matter, this species was a powerful source of energy.|Beekeeper's Lexicon -description.speciesReddened=Requiring massive amounts of alchemically bound matter, these little fellows could flood a world in energy.|Beekeeper's Lexicon -description.speciesOmega="I am Alpha and Omega, the beginning and the end, the first and the last."|Pahimar, beekeeper -description.speciesLeporine="I swear! It was tiny, had wings and I definitely saw fluffy little rabbit ears! ... No! I am not drunk!"|"Sir" Sengir, madman -description.speciesMerry="Hohoho!"|Merry bee -description.speciesTipsy="Dance my pretties! Dance!"|Tipsy Witch of the East -description.speciesTricky="Trick or Tricky Treat!"|Tricky Bee -description.speciesRural="Rain in May promises much hay."|M. Ages, Rural Beekeeper -description.speciesMarshy="Seriously? Mushrooms? Get out of here!"|Beekeeping 101 -description.speciesMonastic="I remained austere and said to him: 'Not only a princess, but also a whole pile of emeralds for a measly drone? That's extortion!'|Beekeeping 101 -description.speciesSecluded="Crossbreeding with the desert kind was a mistake. My bees withdrew more and more from the outside world."|Beekeeping 101 -description.speciesHermitic="My dear colleague! I noticed the bees you sent me refuse to wash and are growing full beards. Care to explain?"|Binnie, Apiarist -description.speciesEnded="I found one of these seemingly hermitical insects in a villager's apiary. It was torpid, obviously ripped from its world and longing for a fragment from it."|Beekeeping 101 -description.speciesSpectral="I was unsure whether it was alive as it lay there in the palm of my hand, glimmering and pulsating, oozing a coldness I never felt before. Then I heard the pile of bones behind me rattle..."|Beekeeping 101 -description.speciesPhantasmal="Whatever you do, do not, I repeat, DO NOT drop the dragon e..."|"Sir" Sengir, Last Words -tile.alveary.0=Alveary -tile.alveary.2=Swarmer -tile.alveary.3=Alveary Fan -tile.alveary.4=Alveary Heater -tile.alveary.5=Alveary Hygroregulator -tile.alveary.6=Alveary Stabiliser -tile.alveary.7=Alveary Sieve -tile.beehives.1=Forest Hive -tile.beehives.2=Meadows Hive -tile.beehives.3=Modest Hive -tile.beehives.4=Tropical Hive -tile.beehives.5=Ender Hive -tile.beehives.6=Wintry Hive -tile.beehives.7=Marshy Hive -tile.candle.stump=Unlit Candle -tile.candle.dyed.stump=Unlit Dyed Candle -tile.candle.lit=Lit Candle -tile.candle.dyed.lit=Lit Dyed Candle -tile.stump.0=Candle Stump -tile.for.apiculture.0=Apiary -tile.for.apiculture.1=Apiarist's Chest -tile.for.apiculture.2=Bee House - diff --git a/forestry_resources/lang/forestry/arboriculture/en_US.properties b/forestry_resources/lang/forestry/arboriculture/en_US.properties deleted file mode 100755 index 182813f18..000000000 --- a/forestry_resources/lang/forestry/arboriculture/en_US.properties +++ /dev/null @@ -1,69 +0,0 @@ -gui.maturity=Matures -gui.treealyzer=Treealyzer -gui.treealyzer.help=Supply sapling and provide honey or honeydew as catalyst. -gui.treealyzer.overview=Analytics available -gui.saplings=Saplings -gui.yield=Yield -gui.sappiness=Sappiness -gui.height=Height -gui.fruits=Fruits -gui.supports=Supports -gui.family=Family -gui.girth=Girth -gui.native=Soil -gui.tolerated=Tolerates -gui.growth=Growth -description.treeOak=Common tree species whose apple-bearing properties are the subject of much song and dance.|Codex Lignum -description.treeBirch=Widespread birch tree, which on average is of smaller height.|Codex Lignum -description.treeLime=Tall, deciduous tree. It has been reclassified recently as being in the Malvaceae family.|Codex Lignum -description.treeWalnut=Tall, deciduous tree with large trunk. Naturally occuring walnut trees carry fruits which require some time to ripe.|Codex Lignum -description.treeChestnut=Tall, deciduous tree with large trunk. Naturally occuring chestnut trees carry fruits which require some time to ripe.|Codex Lignum -description.treeSipiri=Tall, evergreen trees with valuable timber. Wood and bark are pleasantly scented. Will only thrive in tropical climes.|Codex Lignum -description.treeWillow=Large, deciduous tree. White willows are fast-growing. Have only been observed to occur in damp climates.|Codex Lignum -description.treeCherry=Small tree. In its natural form it will bear cherries which will need to undergo a ripening period.|Codex Lignum -family.pomes=Pomes -family.prunes=Prunes -family.nuts=Nuts -family.jungle=Jungle -fruits.apple=Apple -fruits.cherry=Cherry -fruits.chestnut=Chestnut -fruits.walnut=Walnut -fruits.cocoa=Cocoa -fruits.none=None -fruits.plum=Plum -fruits.lemon=Lemon -fruits.dates=Dates -fruits.papaya=Papaya -item.grafter=Grafter -item.grafterProven=Proven Grafter -tile.log=Wood -tile.planks=Wood Planks -tile.slab=Wood Slab -tile.fences=Fence -tile.for.stairs=Stairs -wood.0=Larch -wood.1=Teak -wood.2=Acacia -wood.3=Lime -wood.4=Chestnut -wood.5=Wenge -wood.6=Baobab -wood.7=Sequoia -wood.8=Kapok -wood.9=Ebony -wood.10=Mahogany -wood.11=Balsa -wood.12=Willow -wood.13=Walnut -wood.14=Greenheart -wood.15=Cherry -wood.16=Mahoe -wood.17=Poplar -wood.18=Palm -wood.19=Papaya -wood.20=Pine -wood.21=Plum -wood.22=Maple -wood.23=Citrus -tile.for.arboriculture.0=Arborist's Chest \ No newline at end of file diff --git a/forestry_resources/lang/forestry/farming/en_US.properties b/forestry_resources/lang/forestry/farming/en_US.properties deleted file mode 100755 index c9fbc72ff..000000000 --- a/forestry_resources/lang/forestry/farming/en_US.properties +++ /dev/null @@ -1,55 +0,0 @@ -circuit.managedArboreal=Arboretum -circuit.managedPeat=Peat Bog -circuit.managedCereal=Crop Farm -circuit.managedVegetable=Vegetable Farm -circuit.managedInfernal=Infernal Farm -circuit.managedShroom=Shroom Farm -circuit.manualOrchard=Orchard -circuit.manualPeat=Peat Bog -circuit.manualCereal=Crop Farm -circuit.manualVegetable=Vegetable Farm -circuit.manualSucculent=Succulent Farm -circuit.manualPoales=Reed Farm -circuit.manualRubber=Rubber Plantation -circuit.manualGourd=Gourd Farm -circuit.manualCocoa=Cocoa Plantation -circuit.manualShroom=Shroom Farm -errors.noFertilizer.desc=No Fertilizer -errors.noFertilizer.help=Farms require fertilizer for function. Compost is insufficient. -errors.noFarmland.desc=No Farmland -errors.noFarmland.help=Smooth sandstone, bricks or stone bricks create a platform the farm will build on. -errors.noLiquid.desc=No Water -errors.noLiquid.help=Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water. -gui.hydration=Hydration Required -gui.hydr.heat=By Heat -gui.hydr.humid=By Humidity -gui.hydr.rainfall=By Rainfall -gui.hydr.overall=Overall -hints.farmland.tag=Lay out your farmland! -hints.farmland.desc=Smooth sandstone, bricks or stone bricks create a platform the farm will build on. -hints.gearbox.tag=Supply power! -hints.gearbox.desc=Use gearboxes to attach engines or power lines to your farm. -hints.valve.tag=Supply water! -hints.valve.desc=Almost all farms require water. Use valve blocks for automation. -hints.fertilizer.tag=Fertilizer needed! -hints.fertilizer.desc=All farms need fertilizer to work. Compost or mulch will not suffice. -hints.hatch.tag=Batten down the hatches! -hints.hatch.desc=Hatches are a pipe or tube's best friend. Use them to automate transport. -hints.circuitboard.tag=Program your farms! -hints.circuitboard.desc=Use a soldering iron to turn your tree farm into any kind of farm you like. -hints.manualfarms.tag=Manual farms! -hints.manualfarms.desc=Apart from the managed farms there are manual farms which will only maintain the farm, but not build it. -hints.farmgui.tag=Soil goes left, seeds go right! -hints.farmgui.desc=Soil goes into the left slots, seeds or saplings into the right slots of the reservoir on the top right part. -layout.farms.managed=Managed Farms -layout.farms.manual=Manual Farms -tile.ffarm.0=Farm Block -tile.ffarm.2=Farm Gearbox -tile.ffarm.3=Farm Hatch -tile.ffarm.4=Farm Valve -tile.ffarm.5=Farm Control -trigger.lowSoil=Soil -trigger.lowLiquid=Water Tank -trigger.lowFertilizer=Fertilizer -usage.farms.managed=Managed Farm -usage.farms.manual=Manual Farm \ No newline at end of file diff --git a/forestry_resources/lang/forestry/lepidopterology/en_US.properties b/forestry_resources/lang/forestry/lepidopterology/en_US.properties deleted file mode 100755 index 5aab512d0..000000000 --- a/forestry_resources/lang/forestry/lepidopterology/en_US.properties +++ /dev/null @@ -1,8 +0,0 @@ -gui.flutterlyzer.help=Supply butterfly and provide honey or honeydew as a pacifier. -gui.loot.butterfly=Possible Butterfly Loot -gui.loot.caterpillar=Possible Caterpillar Loot -item.butterfly=Butterfly -item.moth=Moth -item.flutterlyzer=Flutterlyzer -storage.backpack.lepidopterist=Lepidopterist's Backpack -tile.for.lepidopterology.0=Lepidopterist's Chest \ No newline at end of file diff --git a/forestry_resources/lang/forestry/mail/en_US.properties b/forestry_resources/lang/forestry/mail/en_US.properties deleted file mode 100755 index 47a2a1ad8..000000000 --- a/forestry_resources/lang/forestry/mail/en_US.properties +++ /dev/null @@ -1,23 +0,0 @@ -chat.mail.no_mailbox=Recipient has no mailbox. -chat.mail.not_mailable=Letter is not sendable. -chat.mail.not_postpaid=Letter is not sufficiently stamped. -chat.mail.mailbox_full=Recipient's mailbox is full. -chat.mail.already_mailed=Cannot resend letter. -chat.mail.response_not_mailable=Trade station cannot send the response letter. You need to have a mailbox to deliver to. -chat.mail.insufficient_offer=Trade station demands more. -chat.mail.insufficient_trade_good=Trade station has run out of supplies. -chat.mail.insufficient_buffer=Trade station is full. -chat.mail.insufficient_paper=Trade station ran out of paper. -chat.mail.insufficient_stamps=Trade station ran out of stamps. -chat.mail.ok=Trade is available. -chat.mail.wrongstacksize=Can only write one letter at a time. -gui.mail.catalogue.close=Close -gui.mail.catalogue.trade=Trade -gui.mail.filter.all=All -gui.mail.filter.online=Online -gui.mail.filter.offline=Offline -gui.mail.willtrade=%s will trade -gui.mail.address.copy=Use -gui.mail.tradefor=for -gui.mail.notrades=No trades available. -item.catalogue=Catalogue \ No newline at end of file diff --git a/forestry_resources/lang/forestry/pipes/en_US.properties b/forestry_resources/lang/forestry/pipes/en_US.properties deleted file mode 100755 index c7f569f8a..000000000 --- a/forestry_resources/lang/forestry/pipes/en_US.properties +++ /dev/null @@ -1,2 +0,0 @@ - -item.PipeItemsPropolis=Apiarist's Pipe \ No newline at end of file diff --git a/lang b/lang index 3788b2e0b..5d03b6117 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 3788b2e0b744d9b84a0bb4f9ec0f37786cc01874 +Subproject commit 5d03b6117909e31f6dc60f85712962455653798c diff --git a/pipes_common/forestry/pipes/PipeItemsPropolis.java b/pipes_common/forestry/pipes/PipeItemsPropolis.java deleted file mode 100755 index 0506565d4..000000000 --- a/pipes_common/forestry/pipes/PipeItemsPropolis.java +++ /dev/null @@ -1,160 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 by SirSengir - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/. - ******************************************************************************/ -package forestry.pipes; - -import java.util.ArrayList; -import java.util.LinkedList; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; -import buildcraft.api.core.IIconProvider; -import buildcraft.api.core.Position; -import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.IPipeTransportItemsHook; -import buildcraft.transport.Pipe; -import buildcraft.transport.PipeTransportItems; -import buildcraft.transport.TransportConstants; -import buildcraft.transport.TravelingItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.apiculture.IBee; -import forestry.api.core.ForestryAPI; -import forestry.api.genetics.IAllele; -import forestry.core.network.GuiId; -import forestry.core.proxy.Proxies; -import forestry.plugins.PluginApiculture; - -public class PipeItemsPropolis extends Pipe implements IPipeTransportItemsHook { - - public final PipeLogicPropolis pipeLogic; - - public PipeItemsPropolis(int itemID) { - super(new PipeTransportItems(), itemID); - pipeLogic = new PipeLogicPropolis(this); - transport.allowBouncing = true; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) { - super.readFromNBT(nbt); - pipeLogic.readFromNBT(nbt); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - super.writeToNBT(nbt); - pipeLogic.writeToNBT(nbt); - } - IIconProvider provider; - - @SideOnly(Side.CLIENT) - @Override - public IIconProvider getIconProvider() { - if (provider == null) - provider = new PipeIconProvider(); - - return provider; - } - - @Override - public int getIconIndex(ForgeDirection direction) { - if (direction == ForgeDirection.UNKNOWN) - return 0; - - return direction.ordinal() + 1; - } - - @Override - public boolean blockActivated(EntityPlayer player) { - if (!Proxies.common.isSimulating(getWorld())) - return true; - - if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().itemID < Block.blocksList.length) - if (Block.blocksList[player.getCurrentEquippedItem().itemID] instanceof BlockGenericPipe) - return false; - - player.openGui(ForestryAPI.instance, GuiId.PropolisPipeGUI.ordinal(), player.worldObj, container.xCoord, container.yCoord, container.zCoord); - - return true; - } - - @Override - public LinkedList filterPossibleMovements(LinkedList possibleOrientations, Position pos, TravelingItem item) { - - LinkedList filteredOrientations = new LinkedList(); - LinkedList typedOrientations = new LinkedList(); - LinkedList defaultOrientations = new LinkedList(); - - // We need a bee! - EnumFilterType type = EnumFilterType.getType(item.getItemStack()); - IBee bee = null; - - if (type != EnumFilterType.ITEM) - bee = PluginApiculture.beeInterface.getMember(item.getItemStack()); - - // Filtered outputs - for (ForgeDirection dir : possibleOrientations) { - - // Continue if this direction is closed. - if (pipeLogic.isClosed(dir)) - continue; - - if (pipeLogic.isIndiscriminate(dir)) { - defaultOrientations.add(dir); - continue; - } - - // We need to match the type for this orientation's filter - if (!pipeLogic.matchType(dir, type, bee)) - continue; - - // Passing the type filter is enough for non-bee items. - if (type == EnumFilterType.ITEM) { - filteredOrientations.add(dir); - continue; - } - - ArrayList filters = pipeLogic.getGenomeFilters(dir); - // If we have no genome filters, this is only a typed route. - if (filters.size() <= 0) { - typedOrientations.add(dir); - continue; - } - - // Bees need to match one of the genome filters - for (IAllele[] pattern : filters) { - if (pipeLogic.matchAllele(pattern[0], bee.getIdent()) && pipeLogic.matchAllele(pattern[1], bee.getGenome().getSecondary().getUID())) - filteredOrientations.add(dir); - } - } - - if (filteredOrientations.size() > 0) - return filteredOrientations; - else if (typedOrientations.size() > 0) - return typedOrientations; - else - return defaultOrientations; - - } - - @Override - public void entityEntered(TravelingItem item, ForgeDirection orientation) { - // A bit of speed to perhaps prevent bees from popping out of the pipe. - try { - item.setSpeed(TransportConstants.PIPE_NORMAL_SPEED * 20F); - } catch (Throwable error) { - } - } - - @Override - public void readjustSpeed(TravelingItem item) { - transport.defaultReajustSpeed(item); - } -} diff --git a/pipes_common/forestry/pipes/proxy/ProxyPipes.java b/pipes_common/forestry/pipes/proxy/ProxyPipes.java deleted file mode 100755 index c68f7a7ab..000000000 --- a/pipes_common/forestry/pipes/proxy/ProxyPipes.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 by SirSengir - * - * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License. - * - * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/. - ******************************************************************************/ -package forestry.pipes.proxy; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; -import buildcraft.BuildCraftTransport; -import buildcraft.transport.BlockGenericPipe; -import buildcraft.transport.Pipe; -import cpw.mods.fml.common.registry.GameRegistry; -import forestry.pipes.PipeItemsPropolis; -import forestry.plugins.PluginPropolisPipe; - -public class ProxyPipes { - - public void registerCustomItemRenderer(int itemID, IItemRenderer basemod) { - } - - public void initPropolisPipe() { - PluginPropolisPipe.pipeItemsPropolis = createPipe(PluginPropolisPipe.propolisPipeItemId, PipeItemsPropolis.class, "Apiarist's Pipe"); - } - - public Item createPipe(int id, Class clas, String description) { - - Item pipe = BlockGenericPipe.registerPipe(id, clas); - pipe.setUnlocalizedName(clas.getSimpleName()); - - return pipe; - } - - public void registerCraftingPropolis(ItemStack resource) { - GameRegistry.addRecipe(new ItemStack(PluginPropolisPipe.pipeItemsPropolis), - new Object[] { "#X#", Character.valueOf('#'), resource, Character.valueOf('X'), BuildCraftTransport.pipeItemsDiamond }); - - } - - public void addLocalizations() { - } -} diff --git a/forestry_common/core/forestry/Forestry.java b/src/main/java/forestry/Forestry.java similarity index 100% rename from forestry_common/core/forestry/Forestry.java rename to src/main/java/forestry/Forestry.java diff --git a/forestry_common/apiculture/forestry/apiculture/BeekeepingLogic.java b/src/main/java/forestry/apiculture/BeekeepingLogic.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/BeekeepingLogic.java rename to src/main/java/forestry/apiculture/BeekeepingLogic.java diff --git a/forestry_common/apiculture/forestry/apiculture/CommandBeekeepingMode.java b/src/main/java/forestry/apiculture/CommandBeekeepingMode.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/CommandBeekeepingMode.java rename to src/main/java/forestry/apiculture/CommandBeekeepingMode.java diff --git a/forestry_common/apiculture/forestry/apiculture/CommandGiveBee.java b/src/main/java/forestry/apiculture/CommandGiveBee.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/CommandGiveBee.java rename to src/main/java/forestry/apiculture/CommandGiveBee.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderCacti.java b/src/main/java/forestry/apiculture/FlowerProviderCacti.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderCacti.java rename to src/main/java/forestry/apiculture/FlowerProviderCacti.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderEnd.java b/src/main/java/forestry/apiculture/FlowerProviderEnd.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderEnd.java rename to src/main/java/forestry/apiculture/FlowerProviderEnd.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderGourd.java b/src/main/java/forestry/apiculture/FlowerProviderGourd.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderGourd.java rename to src/main/java/forestry/apiculture/FlowerProviderGourd.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderJungle.java b/src/main/java/forestry/apiculture/FlowerProviderJungle.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderJungle.java rename to src/main/java/forestry/apiculture/FlowerProviderJungle.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderMushroom.java b/src/main/java/forestry/apiculture/FlowerProviderMushroom.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderMushroom.java rename to src/main/java/forestry/apiculture/FlowerProviderMushroom.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderNetherwart.java b/src/main/java/forestry/apiculture/FlowerProviderNetherwart.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderNetherwart.java rename to src/main/java/forestry/apiculture/FlowerProviderNetherwart.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderVanilla.java b/src/main/java/forestry/apiculture/FlowerProviderVanilla.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderVanilla.java rename to src/main/java/forestry/apiculture/FlowerProviderVanilla.java diff --git a/forestry_common/apiculture/forestry/apiculture/FlowerProviderWheat.java b/src/main/java/forestry/apiculture/FlowerProviderWheat.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/FlowerProviderWheat.java rename to src/main/java/forestry/apiculture/FlowerProviderWheat.java diff --git a/forestry_common/apiculture/forestry/apiculture/GuiHandlerApiculture.java b/src/main/java/forestry/apiculture/GuiHandlerApiculture.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/GuiHandlerApiculture.java rename to src/main/java/forestry/apiculture/GuiHandlerApiculture.java diff --git a/forestry_common/apiculture/forestry/apiculture/MaterialBeehive.java b/src/main/java/forestry/apiculture/MaterialBeehive.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/MaterialBeehive.java rename to src/main/java/forestry/apiculture/MaterialBeehive.java diff --git a/forestry_common/apiculture/forestry/apiculture/PacketHandlerApiculture.java b/src/main/java/forestry/apiculture/PacketHandlerApiculture.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/PacketHandlerApiculture.java rename to src/main/java/forestry/apiculture/PacketHandlerApiculture.java diff --git a/forestry_common/apiculture/forestry/apiculture/SaveEventHandlerApiculture.java b/src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/SaveEventHandlerApiculture.java rename to src/main/java/forestry/apiculture/SaveEventHandlerApiculture.java diff --git a/forestry_common/apiculture/forestry/apiculture/SpeciesNotFoundException.java b/src/main/java/forestry/apiculture/SpeciesNotFoundException.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/SpeciesNotFoundException.java rename to src/main/java/forestry/apiculture/SpeciesNotFoundException.java diff --git a/forestry_common/apiculture/forestry/apiculture/TemplateNotFoundException.java b/src/main/java/forestry/apiculture/TemplateNotFoundException.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/TemplateNotFoundException.java rename to src/main/java/forestry/apiculture/TemplateNotFoundException.java diff --git a/forestry_common/apiculture/forestry/apiculture/VillageHandlerApiculture.java b/src/main/java/forestry/apiculture/VillageHandlerApiculture.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/VillageHandlerApiculture.java rename to src/main/java/forestry/apiculture/VillageHandlerApiculture.java diff --git a/forestry_common/apiculture/forestry/apiculture/entities/EntityBee.java b/src/main/java/forestry/apiculture/entities/EntityBee.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/entities/EntityBee.java rename to src/main/java/forestry/apiculture/entities/EntityBee.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/BlockAlveary.java b/src/main/java/forestry/apiculture/gadgets/BlockAlveary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/BlockAlveary.java rename to src/main/java/forestry/apiculture/gadgets/BlockAlveary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/BlockBeehives.java b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java similarity index 99% rename from forestry_common/apiculture/forestry/apiculture/gadgets/BlockBeehives.java rename to src/main/java/forestry/apiculture/gadgets/BlockBeehives.java index c8b3b63f9..1bdf838ca 100755 --- a/forestry_common/apiculture/forestry/apiculture/gadgets/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/gadgets/BlockBeehives.java @@ -57,7 +57,7 @@ public class BlockBeehives extends BlockContainer { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { if (canHarvestBlock(player, world.getBlockMetadata(x, y, z))) { // Handle TE'd beehives TileEntity tile = world.getTileEntity(x, y, z); diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/BlockCandle.java b/src/main/java/forestry/apiculture/gadgets/BlockCandle.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/BlockCandle.java rename to src/main/java/forestry/apiculture/gadgets/BlockCandle.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/BlockStump.java b/src/main/java/forestry/apiculture/gadgets/BlockStump.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/BlockStump.java rename to src/main/java/forestry/apiculture/gadgets/BlockStump.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/StructureLogicAlveary.java b/src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/StructureLogicAlveary.java rename to src/main/java/forestry/apiculture/gadgets/StructureLogicAlveary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlveary.java rename to src/main/java/forestry/apiculture/gadgets/TileAlveary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyClimatiser.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearyClimatiser.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyFan.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyFan.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearyFan.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyHeater.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyHeater.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearyHeater.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyPlain.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java similarity index 99% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyPlain.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java index 82bebfc98..104284e46 100755 --- a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyPlain.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearyPlain.java @@ -24,17 +24,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.inventory.ISpecialInventory; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.apiculture.IBeeListener; import forestry.api.apiculture.IBeeModifier; import forestry.api.apiculture.IBeekeepingLogic; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.ForestryAPI; -import forestry.api.core.ITileStructure; +import forestry.api.core.*; import forestry.api.genetics.IIndividual; import forestry.apiculture.gui.ContainerAlveary; import forestry.core.EnumErrorCode; diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearySieve.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearySieve.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearySieve.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyStabiliser.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearyStabiliser.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearyStabiliser.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java similarity index 99% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearySwarmer.java rename to src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java index f75aead6b..b05f393fb 100755 --- a/forestry_common/apiculture/forestry/apiculture/gadgets/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlvearySwarmer.java @@ -21,14 +21,13 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.inventory.ISpecialInventory; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlvearyComponent; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.apiculture.worldgen.WorldGenHive; import forestry.apiculture.worldgen.WorldGenHiveSwamer; import forestry.core.network.GuiId; diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileApiaristChest.java b/src/main/java/forestry/apiculture/gadgets/TileApiaristChest.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileApiaristChest.java rename to src/main/java/forestry/apiculture/gadgets/TileApiaristChest.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileApiary.java rename to src/main/java/forestry/apiculture/gadgets/TileApiary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileBeehouse.java b/src/main/java/forestry/apiculture/gadgets/TileBeehouse.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileBeehouse.java rename to src/main/java/forestry/apiculture/gadgets/TileBeehouse.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileCandle.java b/src/main/java/forestry/apiculture/gadgets/TileCandle.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileCandle.java rename to src/main/java/forestry/apiculture/gadgets/TileCandle.java diff --git a/forestry_common/apiculture/forestry/apiculture/gadgets/TileSwarm.java b/src/main/java/forestry/apiculture/gadgets/TileSwarm.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gadgets/TileSwarm.java rename to src/main/java/forestry/apiculture/gadgets/TileSwarm.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AIAvoidPlayers.java b/src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AIAvoidPlayers.java rename to src/main/java/forestry/apiculture/genetics/AIAvoidPlayers.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleBeeSpecies.java b/src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleBeeSpecies.java rename to src/main/java/forestry/apiculture/genetics/AlleleBeeSpecies.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectAggressive.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectAggressive.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectAggressive.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectCreeper.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectCreeper.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectCreeper.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectExploration.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectExploration.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectExploration.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectGlacial.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectGlacial.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectGlacial.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectHeroic.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectHeroic.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectHeroic.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectIgnition.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectIgnition.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectIgnition.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectMiasmic.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectMiasmic.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectMiasmic.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectMisanthrope.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectMisanthrope.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectMisanthrope.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectNone.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectNone.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectNone.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectPotion.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectPotion.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectPotion.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectRadioactive.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectRadioactive.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectRadioactive.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectRepulsion.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectRepulsion.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectRepulsion.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectResurrection.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectResurrection.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectResurrection.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectSnowing.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectSnowing.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectSnowing.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectThrottled.java b/src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleEffectThrottled.java rename to src/main/java/forestry/apiculture/genetics/AlleleEffectThrottled.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/AlleleFlowers.java b/src/main/java/forestry/apiculture/genetics/AlleleFlowers.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/AlleleFlowers.java rename to src/main/java/forestry/apiculture/genetics/AlleleFlowers.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/ApiaristTracker.java b/src/main/java/forestry/apiculture/genetics/ApiaristTracker.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/ApiaristTracker.java rename to src/main/java/forestry/apiculture/genetics/ApiaristTracker.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/Bee.java rename to src/main/java/forestry/apiculture/genetics/Bee.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/BeeGenome.java rename to src/main/java/forestry/apiculture/genetics/BeeGenome.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/BeeHelper.java b/src/main/java/forestry/apiculture/genetics/BeeHelper.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/BeeHelper.java rename to src/main/java/forestry/apiculture/genetics/BeeHelper.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/BeeMutation.java b/src/main/java/forestry/apiculture/genetics/BeeMutation.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/BeeMutation.java rename to src/main/java/forestry/apiculture/genetics/BeeMutation.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/BeeTemplates.java b/src/main/java/forestry/apiculture/genetics/BeeTemplates.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/BeeTemplates.java rename to src/main/java/forestry/apiculture/genetics/BeeTemplates.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/BeekeepingMode.java b/src/main/java/forestry/apiculture/genetics/BeekeepingMode.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/BeekeepingMode.java rename to src/main/java/forestry/apiculture/genetics/BeekeepingMode.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/BranchBees.java b/src/main/java/forestry/apiculture/genetics/BranchBees.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/BranchBees.java rename to src/main/java/forestry/apiculture/genetics/BranchBees.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/HiveDrop.java b/src/main/java/forestry/apiculture/genetics/HiveDrop.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/HiveDrop.java rename to src/main/java/forestry/apiculture/genetics/HiveDrop.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/IJubilanceProvider.java b/src/main/java/forestry/apiculture/genetics/IJubilanceProvider.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/IJubilanceProvider.java rename to src/main/java/forestry/apiculture/genetics/IJubilanceProvider.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/JubilanceDefault.java b/src/main/java/forestry/apiculture/genetics/JubilanceDefault.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/JubilanceDefault.java rename to src/main/java/forestry/apiculture/genetics/JubilanceDefault.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/JubilanceNone.java b/src/main/java/forestry/apiculture/genetics/JubilanceNone.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/JubilanceNone.java rename to src/main/java/forestry/apiculture/genetics/JubilanceNone.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/JubilanceProviderHermit.java b/src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/JubilanceProviderHermit.java rename to src/main/java/forestry/apiculture/genetics/JubilanceProviderHermit.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/JubilanceReqRes.java b/src/main/java/forestry/apiculture/genetics/JubilanceReqRes.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/JubilanceReqRes.java rename to src/main/java/forestry/apiculture/genetics/JubilanceReqRes.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/MutationEMC.java b/src/main/java/forestry/apiculture/genetics/MutationEMC.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/MutationEMC.java rename to src/main/java/forestry/apiculture/genetics/MutationEMC.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/MutationReqRes.java b/src/main/java/forestry/apiculture/genetics/MutationReqRes.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/MutationReqRes.java rename to src/main/java/forestry/apiculture/genetics/MutationReqRes.java diff --git a/forestry_common/apiculture/forestry/apiculture/genetics/MutationTimeLimited.java b/src/main/java/forestry/apiculture/genetics/MutationTimeLimited.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/genetics/MutationTimeLimited.java rename to src/main/java/forestry/apiculture/genetics/MutationTimeLimited.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerAlveary.java b/src/main/java/forestry/apiculture/gui/ContainerAlveary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerAlveary.java rename to src/main/java/forestry/apiculture/gui/ContainerAlveary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java rename to src/main/java/forestry/apiculture/gui/ContainerAlvearyHygroregulator.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerAlvearySieve.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerAlvearySieve.java rename to src/main/java/forestry/apiculture/gui/ContainerAlvearySieve.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerAlvearySwarmer.java rename to src/main/java/forestry/apiculture/gui/ContainerAlvearySwarmer.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerApiary.java b/src/main/java/forestry/apiculture/gui/ContainerApiary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerApiary.java rename to src/main/java/forestry/apiculture/gui/ContainerApiary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerBeealyzer.java b/src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerBeealyzer.java rename to src/main/java/forestry/apiculture/gui/ContainerBeealyzer.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerHabitatLocator.java b/src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerHabitatLocator.java rename to src/main/java/forestry/apiculture/gui/ContainerHabitatLocator.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/ContainerImprinter.java b/src/main/java/forestry/apiculture/gui/ContainerImprinter.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/ContainerImprinter.java rename to src/main/java/forestry/apiculture/gui/ContainerImprinter.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiAlveary.java rename to src/main/java/forestry/apiculture/gui/GuiAlveary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiAlvearyHygroregulator.java rename to src/main/java/forestry/apiculture/gui/GuiAlvearyHygroregulator.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiAlvearySieve.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiAlvearySieve.java rename to src/main/java/forestry/apiculture/gui/GuiAlvearySieve.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiAlvearySwarmer.java b/src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiAlvearySwarmer.java rename to src/main/java/forestry/apiculture/gui/GuiAlvearySwarmer.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiApiary.java b/src/main/java/forestry/apiculture/gui/GuiApiary.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiApiary.java rename to src/main/java/forestry/apiculture/gui/GuiApiary.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiBeealyzer.java b/src/main/java/forestry/apiculture/gui/GuiBeealyzer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiBeealyzer.java rename to src/main/java/forestry/apiculture/gui/GuiBeealyzer.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiHabitatLocator.java b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiHabitatLocator.java rename to src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java diff --git a/forestry_common/apiculture/forestry/apiculture/gui/GuiImprinter.java b/src/main/java/forestry/apiculture/gui/GuiImprinter.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/gui/GuiImprinter.java rename to src/main/java/forestry/apiculture/gui/GuiImprinter.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemAlvearyBlock.java b/src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemAlvearyBlock.java rename to src/main/java/forestry/apiculture/items/ItemAlvearyBlock.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemArmorApiarist.java rename to src/main/java/forestry/apiculture/items/ItemArmorApiarist.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemBeeGE.java rename to src/main/java/forestry/apiculture/items/ItemBeeGE.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemBeealyzer.java b/src/main/java/forestry/apiculture/items/ItemBeealyzer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemBeealyzer.java rename to src/main/java/forestry/apiculture/items/ItemBeealyzer.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemBiomefinder.java b/src/main/java/forestry/apiculture/items/ItemBiomefinder.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemBiomefinder.java rename to src/main/java/forestry/apiculture/items/ItemBiomefinder.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemCandleBlock.java b/src/main/java/forestry/apiculture/items/ItemCandleBlock.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemCandleBlock.java rename to src/main/java/forestry/apiculture/items/ItemCandleBlock.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemHiveFrame.java b/src/main/java/forestry/apiculture/items/ItemHiveFrame.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemHiveFrame.java rename to src/main/java/forestry/apiculture/items/ItemHiveFrame.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemHoneycomb.java b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemHoneycomb.java rename to src/main/java/forestry/apiculture/items/ItemHoneycomb.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemImprinter.java b/src/main/java/forestry/apiculture/items/ItemImprinter.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemImprinter.java rename to src/main/java/forestry/apiculture/items/ItemImprinter.java diff --git a/forestry_common/apiculture/forestry/apiculture/items/ItemWaxCast.java b/src/main/java/forestry/apiculture/items/ItemWaxCast.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/items/ItemWaxCast.java rename to src/main/java/forestry/apiculture/items/ItemWaxCast.java diff --git a/forestry_common/apiculture/forestry/apiculture/proxy/ClientProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java similarity index 95% rename from forestry_common/apiculture/forestry/apiculture/proxy/ClientProxyApiculture.java rename to src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java index 302bf5bd6..167b26122 100755 --- a/forestry_common/apiculture/forestry/apiculture/proxy/ClientProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ClientProxyApiculture.java @@ -27,7 +27,6 @@ import forestry.core.config.ForestryItem; import forestry.core.interfaces.IBlockRenderer; import forestry.core.render.RenderAnalyzer; import forestry.core.render.TextureManager; -import forestry.core.utils.Localization; import forestry.plugins.PluginApiculture; public class ClientProxyApiculture extends ProxyApiculture { @@ -91,9 +90,4 @@ public class ClientProxyApiculture extends ProxyApiculture { return new RenderAnalyzer(gfxBase); } - @Override - public void addLocalizations() { - Localization.instance.addLocalization("/lang/forestry/apiculture/"); - } - } diff --git a/forestry_common/apiculture/forestry/apiculture/proxy/ProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java similarity index 96% rename from forestry_common/apiculture/forestry/apiculture/proxy/ProxyApiculture.java rename to src/main/java/forestry/apiculture/proxy/ProxyApiculture.java index 1bdd5fe21..267396f1b 100755 --- a/forestry_common/apiculture/forestry/apiculture/proxy/ProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java @@ -25,9 +25,6 @@ public class ProxyApiculture { return null; } - public void addLocalizations() { - } - public void initializeRendering() { } diff --git a/forestry_common/apiculture/forestry/apiculture/render/BeeItemRenderer.java b/src/main/java/forestry/apiculture/render/BeeItemRenderer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/BeeItemRenderer.java rename to src/main/java/forestry/apiculture/render/BeeItemRenderer.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/BlockCandleRenderer.java b/src/main/java/forestry/apiculture/render/BlockCandleRenderer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/BlockCandleRenderer.java rename to src/main/java/forestry/apiculture/render/BlockCandleRenderer.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/EntityBeeFX.java b/src/main/java/forestry/apiculture/render/EntityBeeFX.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/EntityBeeFX.java rename to src/main/java/forestry/apiculture/render/EntityBeeFX.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/ModelAnalyzer.java b/src/main/java/forestry/apiculture/render/ModelAnalyzer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/ModelAnalyzer.java rename to src/main/java/forestry/apiculture/render/ModelAnalyzer.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/ModelBee.java b/src/main/java/forestry/apiculture/render/ModelBee.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/ModelBee.java rename to src/main/java/forestry/apiculture/render/ModelBee.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/ParticleRenderer.java b/src/main/java/forestry/apiculture/render/ParticleRenderer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/ParticleRenderer.java rename to src/main/java/forestry/apiculture/render/ParticleRenderer.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/RenderBee.java b/src/main/java/forestry/apiculture/render/RenderBee.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/RenderBee.java rename to src/main/java/forestry/apiculture/render/RenderBee.java diff --git a/forestry_common/apiculture/forestry/apiculture/render/TextureBiomefinder.java b/src/main/java/forestry/apiculture/render/TextureBiomefinder.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/render/TextureBiomefinder.java rename to src/main/java/forestry/apiculture/render/TextureBiomefinder.java diff --git a/forestry_common/apiculture/forestry/apiculture/trigger/TriggerNoFrames.java b/src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/trigger/TriggerNoFrames.java rename to src/main/java/forestry/apiculture/trigger/TriggerNoFrames.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java b/src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java rename to src/main/java/forestry/apiculture/worldgen/ComponentVillageBeeHouse.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/HiveDecorator.java rename to src/main/java/forestry/apiculture/worldgen/HiveDecorator.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHive.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHive.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHive.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHive.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveEnd.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveEnd.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveEnd.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveEnd.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveForest.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveForest.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveForest.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveForest.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveJungle.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveJungle.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveJungle.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveJungle.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveMeadows.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveMeadows.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveMeadows.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveMeadows.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveParched.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveParched.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveParched.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveParched.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveSnow.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveSnow.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveSnow.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveSnow.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveSwamer.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveSwamer.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveSwamer.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveSwamer.java diff --git a/forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveSwamp.java b/src/main/java/forestry/apiculture/worldgen/WorldGenHiveSwamp.java similarity index 100% rename from forestry_common/apiculture/forestry/apiculture/worldgen/WorldGenHiveSwamp.java rename to src/main/java/forestry/apiculture/worldgen/WorldGenHiveSwamp.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/CommandSpawnForest.java b/src/main/java/forestry/arboriculture/CommandSpawnForest.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/CommandSpawnForest.java rename to src/main/java/forestry/arboriculture/CommandSpawnForest.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/CommandSpawnTree.java b/src/main/java/forestry/arboriculture/CommandSpawnTree.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/CommandSpawnTree.java rename to src/main/java/forestry/arboriculture/CommandSpawnTree.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/CommandTreekeepingMode.java b/src/main/java/forestry/arboriculture/CommandTreekeepingMode.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/CommandTreekeepingMode.java rename to src/main/java/forestry/arboriculture/CommandTreekeepingMode.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/EventHandlerArboriculture.java b/src/main/java/forestry/arboriculture/EventHandlerArboriculture.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/EventHandlerArboriculture.java rename to src/main/java/forestry/arboriculture/EventHandlerArboriculture.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/FruitProviderNone.java b/src/main/java/forestry/arboriculture/FruitProviderNone.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/FruitProviderNone.java rename to src/main/java/forestry/arboriculture/FruitProviderNone.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/FruitProviderPod.java b/src/main/java/forestry/arboriculture/FruitProviderPod.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/FruitProviderPod.java rename to src/main/java/forestry/arboriculture/FruitProviderPod.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/FruitProviderRandom.java b/src/main/java/forestry/arboriculture/FruitProviderRandom.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/FruitProviderRandom.java rename to src/main/java/forestry/arboriculture/FruitProviderRandom.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/FruitProviderRipening.java b/src/main/java/forestry/arboriculture/FruitProviderRipening.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/FruitProviderRipening.java rename to src/main/java/forestry/arboriculture/FruitProviderRipening.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/GuiHandlerArboriculture.java b/src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/GuiHandlerArboriculture.java rename to src/main/java/forestry/arboriculture/GuiHandlerArboriculture.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/IWoodTyped.java b/src/main/java/forestry/arboriculture/IWoodTyped.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/IWoodTyped.java rename to src/main/java/forestry/arboriculture/IWoodTyped.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/PacketHandlerArboriculture.java b/src/main/java/forestry/arboriculture/PacketHandlerArboriculture.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/PacketHandlerArboriculture.java rename to src/main/java/forestry/arboriculture/PacketHandlerArboriculture.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/VillageHandlerArboriculture.java b/src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/VillageHandlerArboriculture.java rename to src/main/java/forestry/arboriculture/VillageHandlerArboriculture.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/WoodType.java b/src/main/java/forestry/arboriculture/WoodType.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/WoodType.java rename to src/main/java/forestry/arboriculture/WoodType.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/WorldGenHelper.java b/src/main/java/forestry/arboriculture/WorldGenHelper.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/WorldGenHelper.java rename to src/main/java/forestry/arboriculture/WorldGenHelper.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockArbFence.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockArbFence.java rename to src/main/java/forestry/arboriculture/gadgets/BlockArbFence.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockArbStairs.java b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java similarity index 98% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockArbStairs.java rename to src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java index 88ede164c..89ae9b7a8 100755 --- a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockArbStairs.java @@ -67,7 +67,7 @@ public class BlockArbStairs extends BlockStairs { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { int meta = world.getBlockMetadata(x, y, z); if (Proxies.common.isSimulating(world) && canHarvestBlock(player, meta)) if (!player.capabilities.isCreativeMode) { diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockFruitPod.java b/src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockFruitPod.java rename to src/main/java/forestry/arboriculture/gadgets/BlockFruitPod.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockLeaves.java b/src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java similarity index 99% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockLeaves.java rename to src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java index 1ad5dadcc..3452d5474 100755 --- a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockLeaves.java @@ -69,7 +69,7 @@ public class BlockLeaves extends BlockTreeContainer { /* DROP HANDLING */ @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { int metadata = world.getBlockMetadata(x, y, z); if (Proxies.common.isSimulating(world) && canHarvestBlock(player, metadata)) { diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockLog.java b/src/main/java/forestry/arboriculture/gadgets/BlockLog.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockLog.java rename to src/main/java/forestry/arboriculture/gadgets/BlockLog.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockPlanks.java b/src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockPlanks.java rename to src/main/java/forestry/arboriculture/gadgets/BlockPlanks.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockSapling.java b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java similarity index 99% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockSapling.java rename to src/main/java/forestry/arboriculture/gadgets/BlockSapling.java index 38ed14ad3..83443a9a6 100755 --- a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockSapling.java +++ b/src/main/java/forestry/arboriculture/gadgets/BlockSapling.java @@ -146,7 +146,7 @@ public class BlockSapling extends BlockTreeContainer { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { if (Proxies.common.isSimulating(world) && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) if (!player.capabilities.isCreativeMode) dropAsSapling(world, x, y, z); diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockSlab.java b/src/main/java/forestry/arboriculture/gadgets/BlockSlab.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockSlab.java rename to src/main/java/forestry/arboriculture/gadgets/BlockSlab.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockTreeContainer.java b/src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/BlockTreeContainer.java rename to src/main/java/forestry/arboriculture/gadgets/BlockTreeContainer.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/TileArboristChest.java b/src/main/java/forestry/arboriculture/gadgets/TileArboristChest.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/TileArboristChest.java rename to src/main/java/forestry/arboriculture/gadgets/TileArboristChest.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/TileFruitPod.java b/src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/TileFruitPod.java rename to src/main/java/forestry/arboriculture/gadgets/TileFruitPod.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/TileLeaves.java rename to src/main/java/forestry/arboriculture/gadgets/TileLeaves.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/TileSapling.java b/src/main/java/forestry/arboriculture/gadgets/TileSapling.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/TileSapling.java rename to src/main/java/forestry/arboriculture/gadgets/TileSapling.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/TileStairs.java b/src/main/java/forestry/arboriculture/gadgets/TileStairs.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/TileStairs.java rename to src/main/java/forestry/arboriculture/gadgets/TileStairs.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gadgets/TileTreeContainer.java b/src/main/java/forestry/arboriculture/gadgets/TileTreeContainer.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gadgets/TileTreeContainer.java rename to src/main/java/forestry/arboriculture/gadgets/TileTreeContainer.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleFruit.java b/src/main/java/forestry/arboriculture/genetics/AlleleFruit.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleFruit.java rename to src/main/java/forestry/arboriculture/genetics/AlleleFruit.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleGrowth.java b/src/main/java/forestry/arboriculture/genetics/AlleleGrowth.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleGrowth.java rename to src/main/java/forestry/arboriculture/genetics/AlleleGrowth.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleLeafEffectNone.java b/src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleLeafEffectNone.java rename to src/main/java/forestry/arboriculture/genetics/AlleleLeafEffectNone.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleTreeSpecies.java b/src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/AlleleTreeSpecies.java rename to src/main/java/forestry/arboriculture/genetics/AlleleTreeSpecies.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/ArboristTracker.java b/src/main/java/forestry/arboriculture/genetics/ArboristTracker.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/ArboristTracker.java rename to src/main/java/forestry/arboriculture/genetics/ArboristTracker.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/BranchTrees.java b/src/main/java/forestry/arboriculture/genetics/BranchTrees.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/BranchTrees.java rename to src/main/java/forestry/arboriculture/genetics/BranchTrees.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/GrowthProvider.java b/src/main/java/forestry/arboriculture/genetics/GrowthProvider.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/GrowthProvider.java rename to src/main/java/forestry/arboriculture/genetics/GrowthProvider.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/GrowthProviderTropical.java b/src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/GrowthProviderTropical.java rename to src/main/java/forestry/arboriculture/genetics/GrowthProviderTropical.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/Tree.java b/src/main/java/forestry/arboriculture/genetics/Tree.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/Tree.java rename to src/main/java/forestry/arboriculture/genetics/Tree.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/TreeGenome.java rename to src/main/java/forestry/arboriculture/genetics/TreeGenome.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/TreeHelper.java b/src/main/java/forestry/arboriculture/genetics/TreeHelper.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/TreeHelper.java rename to src/main/java/forestry/arboriculture/genetics/TreeHelper.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/TreeMutation.java b/src/main/java/forestry/arboriculture/genetics/TreeMutation.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/TreeMutation.java rename to src/main/java/forestry/arboriculture/genetics/TreeMutation.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/TreeTemplates.java b/src/main/java/forestry/arboriculture/genetics/TreeTemplates.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/TreeTemplates.java rename to src/main/java/forestry/arboriculture/genetics/TreeTemplates.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/genetics/TreekeepingMode.java b/src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/genetics/TreekeepingMode.java rename to src/main/java/forestry/arboriculture/genetics/TreekeepingMode.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gui/ContainerTreealyzer.java b/src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gui/ContainerTreealyzer.java rename to src/main/java/forestry/arboriculture/gui/ContainerTreealyzer.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/gui/GuiTreealyzer.java b/src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/gui/GuiTreealyzer.java rename to src/main/java/forestry/arboriculture/gui/GuiTreealyzer.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/items/ItemGermlingGE.java b/src/main/java/forestry/arboriculture/items/ItemGermlingGE.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/items/ItemGermlingGE.java rename to src/main/java/forestry/arboriculture/items/ItemGermlingGE.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/items/ItemGrafter.java b/src/main/java/forestry/arboriculture/items/ItemGrafter.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/items/ItemGrafter.java rename to src/main/java/forestry/arboriculture/items/ItemGrafter.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/items/ItemStairs.java b/src/main/java/forestry/arboriculture/items/ItemStairs.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/items/ItemStairs.java rename to src/main/java/forestry/arboriculture/items/ItemStairs.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/items/ItemTreealyzer.java b/src/main/java/forestry/arboriculture/items/ItemTreealyzer.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/items/ItemTreealyzer.java rename to src/main/java/forestry/arboriculture/items/ItemTreealyzer.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/items/ItemWoodBlock.java b/src/main/java/forestry/arboriculture/items/ItemWoodBlock.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/items/ItemWoodBlock.java rename to src/main/java/forestry/arboriculture/items/ItemWoodBlock.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/network/PacketLeafUpdate.java b/src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/network/PacketLeafUpdate.java rename to src/main/java/forestry/arboriculture/network/PacketLeafUpdate.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/proxy/ClientProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java similarity index 93% rename from forestry_common/arboriculture/forestry/arboriculture/proxy/ClientProxyArboriculture.java rename to src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java index d39269403..1816182bb 100755 --- a/forestry_common/arboriculture/forestry/arboriculture/proxy/ClientProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ClientProxyArboriculture.java @@ -23,7 +23,6 @@ import forestry.arboriculture.render.LeavesRenderingHandler; import forestry.arboriculture.render.SaplingRenderHandler; import forestry.arboriculture.render.StairItemRenderer; import forestry.core.config.ForestryBlock; -import forestry.core.utils.Localization; import forestry.plugins.PluginArboriculture; public class ClientProxyArboriculture extends ProxyArboriculture { @@ -56,10 +55,4 @@ public class ClientProxyArboriculture extends ProxyArboriculture { public int getFoliageColorPine() { return ColorizerFoliage.getFoliageColorPine(); } - - @Override - public void addLocalizations() { - Localization.instance.addLocalization("/lang/forestry/arboriculture/"); - } - } diff --git a/forestry_common/arboriculture/forestry/arboriculture/proxy/ProxyArboriculture.java b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java similarity index 96% rename from forestry_common/arboriculture/forestry/arboriculture/proxy/ProxyArboriculture.java rename to src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java index bb455365c..0e9c7deb6 100755 --- a/forestry_common/arboriculture/forestry/arboriculture/proxy/ProxyArboriculture.java +++ b/src/main/java/forestry/arboriculture/proxy/ProxyArboriculture.java @@ -32,8 +32,4 @@ public class ProxyArboriculture { public int getBiomeFoliageColour(World world, int x, int z) { return getFoliageColorBasic(); } - - public void addLocalizations() { - } - } diff --git a/forestry_common/arboriculture/forestry/arboriculture/render/FenceRenderingHandler.java b/src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/render/FenceRenderingHandler.java rename to src/main/java/forestry/arboriculture/render/FenceRenderingHandler.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/render/FruitPodRenderingHandler.java b/src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/render/FruitPodRenderingHandler.java rename to src/main/java/forestry/arboriculture/render/FruitPodRenderingHandler.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/render/LeavesRenderingHandler.java b/src/main/java/forestry/arboriculture/render/LeavesRenderingHandler.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/render/LeavesRenderingHandler.java rename to src/main/java/forestry/arboriculture/render/LeavesRenderingHandler.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/render/SaplingRenderHandler.java b/src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/render/SaplingRenderHandler.java rename to src/main/java/forestry/arboriculture/render/SaplingRenderHandler.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/render/StairItemRenderer.java b/src/main/java/forestry/arboriculture/render/StairItemRenderer.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/render/StairItemRenderer.java rename to src/main/java/forestry/arboriculture/render/StairItemRenderer.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/BlockTypeLeaf.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/BlockTypeLeaf.java rename to src/main/java/forestry/arboriculture/worldgen/BlockTypeLeaf.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/BlockTypeVoid.java b/src/main/java/forestry/arboriculture/worldgen/BlockTypeVoid.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/BlockTypeVoid.java rename to src/main/java/forestry/arboriculture/worldgen/BlockTypeVoid.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenAcacia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenAcacia.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenAcacia.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenAcaciaVanilla.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenArboriculture.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenArboriculture.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenArboriculture.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenBalsa.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenBalsa.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenBaobab.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenBaobab.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenBaobab.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenBirch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBirch.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenBirch.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenBirch.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenCherry.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenCherry.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenCherry.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenChestnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenChestnut.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenChestnut.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenDarkOak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDarkOak.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenDarkOak.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenDarkOak.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenDate.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenDate.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenEbony.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenEbony.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenEbony.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenGiganteum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenGiganteum.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenGiganteum.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenGiganteum.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenGreenheart.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenGreenheart.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenGreenheart.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenJungle.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenJungle.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenJungle.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenKapok.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenKapok.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenKapok.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenLarch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenLarch.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenLemon.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenLemon.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenLime.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLime.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenLime.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenLime.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenMahoe.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenMahoe.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenMahoe.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenMahogany.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenMahogany.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenMahogany.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenMaple.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenMaple.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenMaple.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenOak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenOak.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenOak.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenOak.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPapaya.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPapaya.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenPapaya.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPine.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPine.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenPine.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPlum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPlum.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPoplar.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenPoplar.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenSequoia.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenSequoia.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenSequoia.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenSpruce.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenSpruce.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenSpruce.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenTeak.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenTeak.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenTeak.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenTree.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenTree.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenTree.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenWalnut.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenWalnut.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenWalnut.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenWenge.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenWenge.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenWenge.java diff --git a/forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenWillow.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java similarity index 100% rename from forestry_common/arboriculture/forestry/arboriculture/worldgen/WorldGenWillow.java rename to src/main/java/forestry/arboriculture/worldgen/WorldGenWillow.java diff --git a/forestry_common/core/forestry/core/CommandForestry.java b/src/main/java/forestry/core/CommandForestry.java similarity index 100% rename from forestry_common/core/forestry/core/CommandForestry.java rename to src/main/java/forestry/core/CommandForestry.java diff --git a/forestry_common/core/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java similarity index 94% rename from forestry_common/core/forestry/core/CreativeTabForestry.java rename to src/main/java/forestry/core/CreativeTabForestry.java index befd83c12..f06bb508b 100755 --- a/forestry_common/core/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -50,11 +50,6 @@ public class CreativeTabForestry extends CreativeTabs { } } - @Override - public String getTranslatedTabLabel() { - return StringUtil.localize("itemGroup." + this.getTabLabel()); - } - @Override public Item getTabIconItem() { return null; // not used due to overridden getIconItemStack diff --git a/forestry_common/core/forestry/core/EnumErrorCode.java b/src/main/java/forestry/core/EnumErrorCode.java similarity index 100% rename from forestry_common/core/forestry/core/EnumErrorCode.java rename to src/main/java/forestry/core/EnumErrorCode.java diff --git a/forestry_common/core/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java similarity index 100% rename from forestry_common/core/forestry/core/EventHandlerCore.java rename to src/main/java/forestry/core/EventHandlerCore.java diff --git a/forestry_common/core/forestry/core/ForestryClient.java b/src/main/java/forestry/core/ForestryClient.java similarity index 100% rename from forestry_common/core/forestry/core/ForestryClient.java rename to src/main/java/forestry/core/ForestryClient.java diff --git a/forestry_common/core/forestry/core/ForestryConstants.java b/src/main/java/forestry/core/ForestryConstants.java similarity index 100% rename from forestry_common/core/forestry/core/ForestryConstants.java rename to src/main/java/forestry/core/ForestryConstants.java diff --git a/forestry_common/core/forestry/core/ForestryCore.java b/src/main/java/forestry/core/ForestryCore.java similarity index 100% rename from forestry_common/core/forestry/core/ForestryCore.java rename to src/main/java/forestry/core/ForestryCore.java diff --git a/forestry_common/core/forestry/core/GameMode.java b/src/main/java/forestry/core/GameMode.java similarity index 100% rename from forestry_common/core/forestry/core/GameMode.java rename to src/main/java/forestry/core/GameMode.java diff --git a/forestry_common/core/forestry/core/GuiHandler.java b/src/main/java/forestry/core/GuiHandler.java similarity index 100% rename from forestry_common/core/forestry/core/GuiHandler.java rename to src/main/java/forestry/core/GuiHandler.java diff --git a/forestry_common/core/forestry/core/GuiHandlerBase.java b/src/main/java/forestry/core/GuiHandlerBase.java similarity index 100% rename from forestry_common/core/forestry/core/GuiHandlerBase.java rename to src/main/java/forestry/core/GuiHandlerBase.java diff --git a/forestry_common/core/forestry/core/PickupHandlerCore.java b/src/main/java/forestry/core/PickupHandlerCore.java similarity index 100% rename from forestry_common/core/forestry/core/PickupHandlerCore.java rename to src/main/java/forestry/core/PickupHandlerCore.java diff --git a/forestry_common/core/forestry/core/SaveEventHandlerCore.java b/src/main/java/forestry/core/SaveEventHandlerCore.java similarity index 100% rename from forestry_common/core/forestry/core/SaveEventHandlerCore.java rename to src/main/java/forestry/core/SaveEventHandlerCore.java diff --git a/forestry_common/core/forestry/core/TemperatureState.java b/src/main/java/forestry/core/TemperatureState.java similarity index 100% rename from forestry_common/core/forestry/core/TemperatureState.java rename to src/main/java/forestry/core/TemperatureState.java diff --git a/forestry_common/core/forestry/core/TickHandlerCoreClient.java b/src/main/java/forestry/core/TickHandlerCoreClient.java similarity index 100% rename from forestry_common/core/forestry/core/TickHandlerCoreClient.java rename to src/main/java/forestry/core/TickHandlerCoreClient.java diff --git a/forestry_common/core/forestry/core/TickHandlerCoreServer.java b/src/main/java/forestry/core/TickHandlerCoreServer.java similarity index 100% rename from forestry_common/core/forestry/core/TickHandlerCoreServer.java rename to src/main/java/forestry/core/TickHandlerCoreServer.java diff --git a/forestry_common/core/forestry/core/WorldGenerator.java b/src/main/java/forestry/core/WorldGenerator.java similarity index 100% rename from forestry_common/core/forestry/core/WorldGenerator.java rename to src/main/java/forestry/core/WorldGenerator.java diff --git a/forestry_common/core/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/Circuit.java rename to src/main/java/forestry/core/circuits/Circuit.java diff --git a/forestry_common/core/forestry/core/circuits/CircuitBoard.java b/src/main/java/forestry/core/circuits/CircuitBoard.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/CircuitBoard.java rename to src/main/java/forestry/core/circuits/CircuitBoard.java diff --git a/forestry_common/core/forestry/core/circuits/CircuitBoardManager.java b/src/main/java/forestry/core/circuits/CircuitBoardManager.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/CircuitBoardManager.java rename to src/main/java/forestry/core/circuits/CircuitBoardManager.java diff --git a/forestry_common/core/forestry/core/circuits/CircuitId.java b/src/main/java/forestry/core/circuits/CircuitId.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/CircuitId.java rename to src/main/java/forestry/core/circuits/CircuitId.java diff --git a/forestry_common/core/forestry/core/circuits/CircuitLayout.java b/src/main/java/forestry/core/circuits/CircuitLayout.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/CircuitLayout.java rename to src/main/java/forestry/core/circuits/CircuitLayout.java diff --git a/forestry_common/core/forestry/core/circuits/CircuitLibrary.java b/src/main/java/forestry/core/circuits/CircuitLibrary.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/CircuitLibrary.java rename to src/main/java/forestry/core/circuits/CircuitLibrary.java diff --git a/forestry_common/core/forestry/core/circuits/CircuitRegistry.java b/src/main/java/forestry/core/circuits/CircuitRegistry.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/CircuitRegistry.java rename to src/main/java/forestry/core/circuits/CircuitRegistry.java diff --git a/forestry_common/core/forestry/core/circuits/ContainerSolderingIron.java b/src/main/java/forestry/core/circuits/ContainerSolderingIron.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/ContainerSolderingIron.java rename to src/main/java/forestry/core/circuits/ContainerSolderingIron.java diff --git a/forestry_common/core/forestry/core/circuits/EnumCircuitBoardType.java b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/EnumCircuitBoardType.java rename to src/main/java/forestry/core/circuits/EnumCircuitBoardType.java diff --git a/forestry_common/core/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/GuiSolderingIron.java rename to src/main/java/forestry/core/circuits/GuiSolderingIron.java diff --git a/forestry_common/core/forestry/core/circuits/ISolderingIron.java b/src/main/java/forestry/core/circuits/ISolderingIron.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/ISolderingIron.java rename to src/main/java/forestry/core/circuits/ISolderingIron.java diff --git a/forestry_common/core/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/ItemCircuitBoard.java rename to src/main/java/forestry/core/circuits/ItemCircuitBoard.java diff --git a/forestry_common/core/forestry/core/circuits/ItemSolderingIron.java b/src/main/java/forestry/core/circuits/ItemSolderingIron.java similarity index 100% rename from forestry_common/core/forestry/core/circuits/ItemSolderingIron.java rename to src/main/java/forestry/core/circuits/ItemSolderingIron.java diff --git a/forestry_common/core/forestry/core/config/Config.java b/src/main/java/forestry/core/config/Config.java similarity index 99% rename from forestry_common/core/forestry/core/config/Config.java rename to src/main/java/forestry/core/config/Config.java index be28dce9f..a063fe370 100755 --- a/forestry_common/core/forestry/core/config/Config.java +++ b/src/main/java/forestry/core/config/Config.java @@ -29,7 +29,6 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.core.proxy.Proxies; import forestry.core.triggers.ForestryTrigger; -import forestry.core.utils.Localization; public class Config { @@ -302,7 +301,7 @@ public class Config { Properties prop = new Properties(); try { - InputStream hintStream = Localization.class.getResourceAsStream("/config/forestry/hints.properties"); + InputStream hintStream = Config.class.getResourceAsStream("/config/forestry/hints.properties"); prop.load(hintStream); } catch (Exception ex) { ex.printStackTrace(); diff --git a/forestry_common/core/forestry/core/config/Configuration.java b/src/main/java/forestry/core/config/Configuration.java similarity index 100% rename from forestry_common/core/forestry/core/config/Configuration.java rename to src/main/java/forestry/core/config/Configuration.java diff --git a/forestry_common/core/forestry/core/config/Defaults.java b/src/main/java/forestry/core/config/Defaults.java similarity index 100% rename from forestry_common/core/forestry/core/config/Defaults.java rename to src/main/java/forestry/core/config/Defaults.java diff --git a/forestry_common/core/forestry/core/config/ForestryBlock.java b/src/main/java/forestry/core/config/ForestryBlock.java similarity index 100% rename from forestry_common/core/forestry/core/config/ForestryBlock.java rename to src/main/java/forestry/core/config/ForestryBlock.java diff --git a/forestry_common/core/forestry/core/config/ForestryItem.java b/src/main/java/forestry/core/config/ForestryItem.java similarity index 100% rename from forestry_common/core/forestry/core/config/ForestryItem.java rename to src/main/java/forestry/core/config/ForestryItem.java diff --git a/forestry_common/core/forestry/core/config/Property.java b/src/main/java/forestry/core/config/Property.java similarity index 100% rename from forestry_common/core/forestry/core/config/Property.java rename to src/main/java/forestry/core/config/Property.java diff --git a/forestry_common/core/forestry/core/config/SessionVars.java b/src/main/java/forestry/core/config/SessionVars.java similarity index 100% rename from forestry_common/core/forestry/core/config/SessionVars.java rename to src/main/java/forestry/core/config/SessionVars.java diff --git a/forestry_common/core/forestry/core/config/Version.java b/src/main/java/forestry/core/config/Version.java similarity index 100% rename from forestry_common/core/forestry/core/config/Version.java rename to src/main/java/forestry/core/config/Version.java diff --git a/forestry_common/core/forestry/core/gadgets/BlockBase.java b/src/main/java/forestry/core/gadgets/BlockBase.java similarity index 99% rename from forestry_common/core/forestry/core/gadgets/BlockBase.java rename to src/main/java/forestry/core/gadgets/BlockBase.java index bb15cad3c..d856bf142 100755 --- a/forestry_common/core/forestry/core/gadgets/BlockBase.java +++ b/src/main/java/forestry/core/gadgets/BlockBase.java @@ -204,7 +204,7 @@ public class BlockBase extends BlockForestry { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { IOwnable tile = (IOwnable) world.getTileEntity(x, y, z); if (tile.isOwnable() && !tile.allowsRemoval(player)) diff --git a/forestry_common/core/forestry/core/gadgets/BlockForestry.java b/src/main/java/forestry/core/gadgets/BlockForestry.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/BlockForestry.java rename to src/main/java/forestry/core/gadgets/BlockForestry.java diff --git a/forestry_common/core/forestry/core/gadgets/BlockResource.java b/src/main/java/forestry/core/gadgets/BlockResource.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/BlockResource.java rename to src/main/java/forestry/core/gadgets/BlockResource.java diff --git a/forestry_common/core/forestry/core/gadgets/BlockSoil.java b/src/main/java/forestry/core/gadgets/BlockSoil.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/BlockSoil.java rename to src/main/java/forestry/core/gadgets/BlockSoil.java diff --git a/forestry_common/core/forestry/core/gadgets/BlockStainedGlass.java b/src/main/java/forestry/core/gadgets/BlockStainedGlass.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/BlockStainedGlass.java rename to src/main/java/forestry/core/gadgets/BlockStainedGlass.java diff --git a/forestry_common/core/forestry/core/gadgets/BlockStructure.java b/src/main/java/forestry/core/gadgets/BlockStructure.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/BlockStructure.java rename to src/main/java/forestry/core/gadgets/BlockStructure.java diff --git a/forestry_common/core/forestry/core/gadgets/Engine.java b/src/main/java/forestry/core/gadgets/Engine.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/Engine.java rename to src/main/java/forestry/core/gadgets/Engine.java diff --git a/forestry_common/core/forestry/core/gadgets/IStructureBlockItem.java b/src/main/java/forestry/core/gadgets/IStructureBlockItem.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/IStructureBlockItem.java rename to src/main/java/forestry/core/gadgets/IStructureBlockItem.java diff --git a/forestry_common/core/forestry/core/gadgets/MachineDefinition.java b/src/main/java/forestry/core/gadgets/MachineDefinition.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/MachineDefinition.java rename to src/main/java/forestry/core/gadgets/MachineDefinition.java diff --git a/forestry_common/core/forestry/core/gadgets/MachineNBTDefinition.java b/src/main/java/forestry/core/gadgets/MachineNBTDefinition.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/MachineNBTDefinition.java rename to src/main/java/forestry/core/gadgets/MachineNBTDefinition.java diff --git a/forestry_common/core/forestry/core/gadgets/Mill.java b/src/main/java/forestry/core/gadgets/Mill.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/Mill.java rename to src/main/java/forestry/core/gadgets/Mill.java diff --git a/forestry_common/core/forestry/core/gadgets/NaturalistGame.java b/src/main/java/forestry/core/gadgets/NaturalistGame.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/NaturalistGame.java rename to src/main/java/forestry/core/gadgets/NaturalistGame.java diff --git a/forestry_common/core/forestry/core/gadgets/StructureLogic.java b/src/main/java/forestry/core/gadgets/StructureLogic.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/StructureLogic.java rename to src/main/java/forestry/core/gadgets/StructureLogic.java diff --git a/forestry_common/core/forestry/core/gadgets/TileAnalyzer.java b/src/main/java/forestry/core/gadgets/TileAnalyzer.java similarity index 99% rename from forestry_common/core/forestry/core/gadgets/TileAnalyzer.java rename to src/main/java/forestry/core/gadgets/TileAnalyzer.java index 2bf67bc83..514e82d40 100755 --- a/forestry_common/core/forestry/core/gadgets/TileAnalyzer.java +++ b/src/main/java/forestry/core/gadgets/TileAnalyzer.java @@ -26,9 +26,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.inventory.ISpecialInventory; - import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.core.EnumErrorCode; diff --git a/forestry_common/core/forestry/core/gadgets/TileBase.java b/src/main/java/forestry/core/gadgets/TileBase.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TileBase.java rename to src/main/java/forestry/core/gadgets/TileBase.java diff --git a/forestry_common/core/forestry/core/gadgets/TileEngine.java b/src/main/java/forestry/core/gadgets/TileEngine.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TileEngine.java rename to src/main/java/forestry/core/gadgets/TileEngine.java diff --git a/forestry_common/core/forestry/core/gadgets/TileEscritoire.java b/src/main/java/forestry/core/gadgets/TileEscritoire.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TileEscritoire.java rename to src/main/java/forestry/core/gadgets/TileEscritoire.java diff --git a/forestry_common/core/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TileForestry.java rename to src/main/java/forestry/core/gadgets/TileForestry.java diff --git a/forestry_common/core/forestry/core/gadgets/TileMachine.java b/src/main/java/forestry/core/gadgets/TileMachine.java similarity index 99% rename from forestry_common/core/forestry/core/gadgets/TileMachine.java rename to src/main/java/forestry/core/gadgets/TileMachine.java index 86206b6b1..4b1a59ef9 100755 --- a/forestry_common/core/forestry/core/gadgets/TileMachine.java +++ b/src/main/java/forestry/core/gadgets/TileMachine.java @@ -23,10 +23,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.core.ISpecialInventory; import forestry.core.config.Defaults; import forestry.core.config.ForestryBlock; import forestry.core.interfaces.IClimatised; diff --git a/forestry_common/core/forestry/core/gadgets/TileMill.java b/src/main/java/forestry/core/gadgets/TileMill.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TileMill.java rename to src/main/java/forestry/core/gadgets/TileMill.java diff --git a/forestry_common/core/forestry/core/gadgets/TileNaturalistChest.java b/src/main/java/forestry/core/gadgets/TileNaturalistChest.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TileNaturalistChest.java rename to src/main/java/forestry/core/gadgets/TileNaturalistChest.java diff --git a/forestry_common/core/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java similarity index 100% rename from forestry_common/core/forestry/core/gadgets/TilePowered.java rename to src/main/java/forestry/core/gadgets/TilePowered.java diff --git a/forestry_common/core/forestry/core/genetics/Allele.java b/src/main/java/forestry/core/genetics/Allele.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Allele.java rename to src/main/java/forestry/core/genetics/Allele.java diff --git a/forestry_common/core/forestry/core/genetics/AlleleArea.java b/src/main/java/forestry/core/genetics/AlleleArea.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AlleleArea.java rename to src/main/java/forestry/core/genetics/AlleleArea.java diff --git a/forestry_common/core/forestry/core/genetics/AlleleBoolean.java b/src/main/java/forestry/core/genetics/AlleleBoolean.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AlleleBoolean.java rename to src/main/java/forestry/core/genetics/AlleleBoolean.java diff --git a/forestry_common/core/forestry/core/genetics/AlleleFloat.java b/src/main/java/forestry/core/genetics/AlleleFloat.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AlleleFloat.java rename to src/main/java/forestry/core/genetics/AlleleFloat.java diff --git a/forestry_common/core/forestry/core/genetics/AlleleInteger.java b/src/main/java/forestry/core/genetics/AlleleInteger.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AlleleInteger.java rename to src/main/java/forestry/core/genetics/AlleleInteger.java diff --git a/forestry_common/core/forestry/core/genetics/AllelePlantType.java b/src/main/java/forestry/core/genetics/AllelePlantType.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AllelePlantType.java rename to src/main/java/forestry/core/genetics/AllelePlantType.java diff --git a/forestry_common/core/forestry/core/genetics/AlleleRegistry.java b/src/main/java/forestry/core/genetics/AlleleRegistry.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AlleleRegistry.java rename to src/main/java/forestry/core/genetics/AlleleRegistry.java diff --git a/forestry_common/core/forestry/core/genetics/AlleleSpecies.java b/src/main/java/forestry/core/genetics/AlleleSpecies.java similarity index 96% rename from forestry_common/core/forestry/core/genetics/AlleleSpecies.java rename to src/main/java/forestry/core/genetics/AlleleSpecies.java index 7614b8354..8d3b0cd49 100755 --- a/forestry_common/core/forestry/core/genetics/AlleleSpecies.java +++ b/src/main/java/forestry/core/genetics/AlleleSpecies.java @@ -14,6 +14,7 @@ import java.util.Collection; import java.util.Map; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -30,7 +31,6 @@ import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import forestry.core.config.ForestryItem; -import forestry.core.utils.Localization; import forestry.core.utils.StackUtils; import forestry.core.utils.StringUtil; @@ -53,9 +53,7 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpecies { this.branch = branch; this.name = name; this.binomial = binomial; - - if (Localization.instance.hasMapping("description." + uid)) - description = StringUtil.localize("description." + uid); + this.description = StringUtil.localize("description." + uid); AlleleManager.alleleRegistry.registerAllele(this); } diff --git a/forestry_common/core/forestry/core/genetics/AlleleTolerance.java b/src/main/java/forestry/core/genetics/AlleleTolerance.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/AlleleTolerance.java rename to src/main/java/forestry/core/genetics/AlleleTolerance.java diff --git a/forestry_common/core/forestry/core/genetics/Branch.java b/src/main/java/forestry/core/genetics/Branch.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Branch.java rename to src/main/java/forestry/core/genetics/Branch.java diff --git a/forestry_common/core/forestry/core/genetics/BreedingTracker.java b/src/main/java/forestry/core/genetics/BreedingTracker.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/BreedingTracker.java rename to src/main/java/forestry/core/genetics/BreedingTracker.java diff --git a/forestry_common/core/forestry/core/genetics/Chromosome.java b/src/main/java/forestry/core/genetics/Chromosome.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Chromosome.java rename to src/main/java/forestry/core/genetics/Chromosome.java diff --git a/forestry_common/core/forestry/core/genetics/Classification.java b/src/main/java/forestry/core/genetics/Classification.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Classification.java rename to src/main/java/forestry/core/genetics/Classification.java diff --git a/forestry_common/core/forestry/core/genetics/ClimateHelper.java b/src/main/java/forestry/core/genetics/ClimateHelper.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/ClimateHelper.java rename to src/main/java/forestry/core/genetics/ClimateHelper.java diff --git a/forestry_common/core/forestry/core/genetics/EffectData.java b/src/main/java/forestry/core/genetics/EffectData.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/EffectData.java rename to src/main/java/forestry/core/genetics/EffectData.java diff --git a/forestry_common/core/forestry/core/genetics/EnumMutateChance.java b/src/main/java/forestry/core/genetics/EnumMutateChance.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/EnumMutateChance.java rename to src/main/java/forestry/core/genetics/EnumMutateChance.java diff --git a/forestry_common/core/forestry/core/genetics/FruitFamily.java b/src/main/java/forestry/core/genetics/FruitFamily.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/FruitFamily.java rename to src/main/java/forestry/core/genetics/FruitFamily.java diff --git a/forestry_common/core/forestry/core/genetics/GenericRatings.java b/src/main/java/forestry/core/genetics/GenericRatings.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/GenericRatings.java rename to src/main/java/forestry/core/genetics/GenericRatings.java diff --git a/forestry_common/core/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Genome.java rename to src/main/java/forestry/core/genetics/Genome.java diff --git a/forestry_common/core/forestry/core/genetics/Individual.java b/src/main/java/forestry/core/genetics/Individual.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Individual.java rename to src/main/java/forestry/core/genetics/Individual.java diff --git a/forestry_common/core/forestry/core/genetics/IndividualLiving.java b/src/main/java/forestry/core/genetics/IndividualLiving.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/IndividualLiving.java rename to src/main/java/forestry/core/genetics/IndividualLiving.java diff --git a/forestry_common/core/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java similarity index 97% rename from forestry_common/core/forestry/core/genetics/ItemGE.java rename to src/main/java/forestry/core/genetics/ItemGE.java index c7406a256..b9ff4d066 100755 --- a/forestry_common/core/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -55,7 +55,7 @@ public abstract class ItemGE extends Item { } @Override - public boolean hasEffect(ItemStack itemstack) { + public boolean hasEffect(ItemStack itemstack, int pass) { if (!itemstack.hasTagCompound()) return false; diff --git a/forestry_common/core/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/ItemResearchNote.java rename to src/main/java/forestry/core/genetics/ItemResearchNote.java diff --git a/forestry_common/core/forestry/core/genetics/Mutation.java b/src/main/java/forestry/core/genetics/Mutation.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/Mutation.java rename to src/main/java/forestry/core/genetics/Mutation.java diff --git a/forestry_common/core/forestry/core/genetics/SpeciesRoot.java b/src/main/java/forestry/core/genetics/SpeciesRoot.java similarity index 100% rename from forestry_common/core/forestry/core/genetics/SpeciesRoot.java rename to src/main/java/forestry/core/genetics/SpeciesRoot.java diff --git a/forestry_common/core/forestry/core/gui/ClimateLedger.java b/src/main/java/forestry/core/gui/ClimateLedger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ClimateLedger.java rename to src/main/java/forestry/core/gui/ClimateLedger.java diff --git a/forestry_common/core/forestry/core/gui/ContainerAnalyzer.java b/src/main/java/forestry/core/gui/ContainerAnalyzer.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerAnalyzer.java rename to src/main/java/forestry/core/gui/ContainerAnalyzer.java diff --git a/forestry_common/core/forestry/core/gui/ContainerDummy.java b/src/main/java/forestry/core/gui/ContainerDummy.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerDummy.java rename to src/main/java/forestry/core/gui/ContainerDummy.java diff --git a/forestry_common/core/forestry/core/gui/ContainerEscritoire.java b/src/main/java/forestry/core/gui/ContainerEscritoire.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerEscritoire.java rename to src/main/java/forestry/core/gui/ContainerEscritoire.java diff --git a/forestry_common/core/forestry/core/gui/ContainerForestry.java b/src/main/java/forestry/core/gui/ContainerForestry.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerForestry.java rename to src/main/java/forestry/core/gui/ContainerForestry.java diff --git a/forestry_common/core/forestry/core/gui/ContainerItemInventory.java b/src/main/java/forestry/core/gui/ContainerItemInventory.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerItemInventory.java rename to src/main/java/forestry/core/gui/ContainerItemInventory.java diff --git a/forestry_common/core/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java similarity index 98% rename from forestry_common/core/forestry/core/gui/ContainerLiquidTanks.java rename to src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 3e808dd2b..47a3f7273 100755 --- a/forestry_common/core/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -23,8 +23,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; -import buildcraft.api.tools.IToolPipette; - +import forestry.api.core.IToolPipette; import forestry.core.interfaces.ILiquidTankContainer; import forestry.core.network.PacketIds; import forestry.core.network.PacketPayload; diff --git a/forestry_common/core/forestry/core/gui/ContainerNaturalistInventory.java b/src/main/java/forestry/core/gui/ContainerNaturalistInventory.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerNaturalistInventory.java rename to src/main/java/forestry/core/gui/ContainerNaturalistInventory.java diff --git a/forestry_common/core/forestry/core/gui/ContainerSocketed.java b/src/main/java/forestry/core/gui/ContainerSocketed.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ContainerSocketed.java rename to src/main/java/forestry/core/gui/ContainerSocketed.java diff --git a/forestry_common/core/forestry/core/gui/ErrorLedger.java b/src/main/java/forestry/core/gui/ErrorLedger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/ErrorLedger.java rename to src/main/java/forestry/core/gui/ErrorLedger.java diff --git a/forestry_common/core/forestry/core/gui/GuiAlyzer.java b/src/main/java/forestry/core/gui/GuiAlyzer.java similarity index 100% rename from forestry_common/core/forestry/core/gui/GuiAlyzer.java rename to src/main/java/forestry/core/gui/GuiAlyzer.java diff --git a/forestry_common/core/forestry/core/gui/GuiAnalyzer.java b/src/main/java/forestry/core/gui/GuiAnalyzer.java similarity index 100% rename from forestry_common/core/forestry/core/gui/GuiAnalyzer.java rename to src/main/java/forestry/core/gui/GuiAnalyzer.java diff --git a/forestry_common/core/forestry/core/gui/GuiEscritoire.java b/src/main/java/forestry/core/gui/GuiEscritoire.java similarity index 100% rename from forestry_common/core/forestry/core/gui/GuiEscritoire.java rename to src/main/java/forestry/core/gui/GuiEscritoire.java diff --git a/forestry_common/core/forestry/core/gui/GuiForestry.java b/src/main/java/forestry/core/gui/GuiForestry.java similarity index 100% rename from forestry_common/core/forestry/core/gui/GuiForestry.java rename to src/main/java/forestry/core/gui/GuiForestry.java diff --git a/forestry_common/core/forestry/core/gui/GuiNaturalistInventory.java b/src/main/java/forestry/core/gui/GuiNaturalistInventory.java similarity index 100% rename from forestry_common/core/forestry/core/gui/GuiNaturalistInventory.java rename to src/main/java/forestry/core/gui/GuiNaturalistInventory.java diff --git a/forestry_common/core/forestry/core/gui/GuiTextBox.java b/src/main/java/forestry/core/gui/GuiTextBox.java similarity index 100% rename from forestry_common/core/forestry/core/gui/GuiTextBox.java rename to src/main/java/forestry/core/gui/GuiTextBox.java diff --git a/forestry_common/core/forestry/core/gui/HintLedger.java b/src/main/java/forestry/core/gui/HintLedger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/HintLedger.java rename to src/main/java/forestry/core/gui/HintLedger.java diff --git a/forestry_common/core/forestry/core/gui/IGuiSelectable.java b/src/main/java/forestry/core/gui/IGuiSelectable.java similarity index 100% rename from forestry_common/core/forestry/core/gui/IGuiSelectable.java rename to src/main/java/forestry/core/gui/IGuiSelectable.java diff --git a/forestry_common/core/forestry/core/gui/IPagedInventory.java b/src/main/java/forestry/core/gui/IPagedInventory.java similarity index 100% rename from forestry_common/core/forestry/core/gui/IPagedInventory.java rename to src/main/java/forestry/core/gui/IPagedInventory.java diff --git a/forestry_common/core/forestry/core/gui/Ledger.java b/src/main/java/forestry/core/gui/Ledger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/Ledger.java rename to src/main/java/forestry/core/gui/Ledger.java diff --git a/forestry_common/core/forestry/core/gui/LedgerManager.java b/src/main/java/forestry/core/gui/LedgerManager.java similarity index 100% rename from forestry_common/core/forestry/core/gui/LedgerManager.java rename to src/main/java/forestry/core/gui/LedgerManager.java diff --git a/forestry_common/core/forestry/core/gui/OwnerLedger.java b/src/main/java/forestry/core/gui/OwnerLedger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/OwnerLedger.java rename to src/main/java/forestry/core/gui/OwnerLedger.java diff --git a/forestry_common/core/forestry/core/gui/PlainLedger.java b/src/main/java/forestry/core/gui/PlainLedger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/PlainLedger.java rename to src/main/java/forestry/core/gui/PlainLedger.java diff --git a/forestry_common/core/forestry/core/gui/PowerLedger.java b/src/main/java/forestry/core/gui/PowerLedger.java similarity index 100% rename from forestry_common/core/forestry/core/gui/PowerLedger.java rename to src/main/java/forestry/core/gui/PowerLedger.java diff --git a/forestry_common/core/forestry/core/gui/WidgetManager.java b/src/main/java/forestry/core/gui/WidgetManager.java similarity index 100% rename from forestry_common/core/forestry/core/gui/WidgetManager.java rename to src/main/java/forestry/core/gui/WidgetManager.java diff --git a/forestry_common/core/forestry/core/gui/buttons/ButtonTextureSet.java b/src/main/java/forestry/core/gui/buttons/ButtonTextureSet.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/ButtonTextureSet.java rename to src/main/java/forestry/core/gui/buttons/ButtonTextureSet.java diff --git a/forestry_common/core/forestry/core/gui/buttons/GuiBetterButton.java b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/GuiBetterButton.java rename to src/main/java/forestry/core/gui/buttons/GuiBetterButton.java diff --git a/forestry_common/core/forestry/core/gui/buttons/GuiButtonSmall.java b/src/main/java/forestry/core/gui/buttons/GuiButtonSmall.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/GuiButtonSmall.java rename to src/main/java/forestry/core/gui/buttons/GuiButtonSmall.java diff --git a/forestry_common/core/forestry/core/gui/buttons/GuiMultiButton.java b/src/main/java/forestry/core/gui/buttons/GuiMultiButton.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/GuiMultiButton.java rename to src/main/java/forestry/core/gui/buttons/GuiMultiButton.java diff --git a/forestry_common/core/forestry/core/gui/buttons/GuiToggleButton.java b/src/main/java/forestry/core/gui/buttons/GuiToggleButton.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/GuiToggleButton.java rename to src/main/java/forestry/core/gui/buttons/GuiToggleButton.java diff --git a/forestry_common/core/forestry/core/gui/buttons/GuiToggleButtonSmall.java b/src/main/java/forestry/core/gui/buttons/GuiToggleButtonSmall.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/GuiToggleButtonSmall.java rename to src/main/java/forestry/core/gui/buttons/GuiToggleButtonSmall.java diff --git a/forestry_common/core/forestry/core/gui/buttons/IButtonTextureSet.java b/src/main/java/forestry/core/gui/buttons/IButtonTextureSet.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/IButtonTextureSet.java rename to src/main/java/forestry/core/gui/buttons/IButtonTextureSet.java diff --git a/forestry_common/core/forestry/core/gui/buttons/IMultiButtonState.java b/src/main/java/forestry/core/gui/buttons/IMultiButtonState.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/IMultiButtonState.java rename to src/main/java/forestry/core/gui/buttons/IMultiButtonState.java diff --git a/forestry_common/core/forestry/core/gui/buttons/LockButtonState.java b/src/main/java/forestry/core/gui/buttons/LockButtonState.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/LockButtonState.java rename to src/main/java/forestry/core/gui/buttons/LockButtonState.java diff --git a/forestry_common/core/forestry/core/gui/buttons/MultiButtonController.java b/src/main/java/forestry/core/gui/buttons/MultiButtonController.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/MultiButtonController.java rename to src/main/java/forestry/core/gui/buttons/MultiButtonController.java diff --git a/forestry_common/core/forestry/core/gui/buttons/StandardButtonTextureSets.java b/src/main/java/forestry/core/gui/buttons/StandardButtonTextureSets.java similarity index 100% rename from forestry_common/core/forestry/core/gui/buttons/StandardButtonTextureSets.java rename to src/main/java/forestry/core/gui/buttons/StandardButtonTextureSets.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotClosed.java b/src/main/java/forestry/core/gui/slots/SlotClosed.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotClosed.java rename to src/main/java/forestry/core/gui/slots/SlotClosed.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotCraftAuto.java b/src/main/java/forestry/core/gui/slots/SlotCraftAuto.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotCraftAuto.java rename to src/main/java/forestry/core/gui/slots/SlotCraftAuto.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotCrafter.java b/src/main/java/forestry/core/gui/slots/SlotCrafter.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotCrafter.java rename to src/main/java/forestry/core/gui/slots/SlotCrafter.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotCustom.java b/src/main/java/forestry/core/gui/slots/SlotCustom.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotCustom.java rename to src/main/java/forestry/core/gui/slots/SlotCustom.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotForestry.java b/src/main/java/forestry/core/gui/slots/SlotForestry.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotForestry.java rename to src/main/java/forestry/core/gui/slots/SlotForestry.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotItemInventory.java b/src/main/java/forestry/core/gui/slots/SlotItemInventory.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotItemInventory.java rename to src/main/java/forestry/core/gui/slots/SlotItemInventory.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotLiquidContainer.java b/src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotLiquidContainer.java rename to src/main/java/forestry/core/gui/slots/SlotLiquidContainer.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotLocked.java b/src/main/java/forestry/core/gui/slots/SlotLocked.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotLocked.java rename to src/main/java/forestry/core/gui/slots/SlotLocked.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotOutput.java b/src/main/java/forestry/core/gui/slots/SlotOutput.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotOutput.java rename to src/main/java/forestry/core/gui/slots/SlotOutput.java diff --git a/forestry_common/core/forestry/core/gui/slots/SlotWorking.java b/src/main/java/forestry/core/gui/slots/SlotWorking.java similarity index 100% rename from forestry_common/core/forestry/core/gui/slots/SlotWorking.java rename to src/main/java/forestry/core/gui/slots/SlotWorking.java diff --git a/forestry_common/core/forestry/core/gui/tooltips/IToolTipProvider.java b/src/main/java/forestry/core/gui/tooltips/IToolTipProvider.java similarity index 100% rename from forestry_common/core/forestry/core/gui/tooltips/IToolTipProvider.java rename to src/main/java/forestry/core/gui/tooltips/IToolTipProvider.java diff --git a/forestry_common/core/forestry/core/gui/tooltips/ToolTip.java b/src/main/java/forestry/core/gui/tooltips/ToolTip.java similarity index 93% rename from forestry_common/core/forestry/core/gui/tooltips/ToolTip.java rename to src/main/java/forestry/core/gui/tooltips/ToolTip.java index 5dc19878e..aeb08c6c6 100755 --- a/forestry_common/core/forestry/core/gui/tooltips/ToolTip.java +++ b/src/main/java/forestry/core/gui/tooltips/ToolTip.java @@ -15,7 +15,7 @@ import java.util.List; import com.google.common.collect.ForwardingList; -import forestry.core.utils.Localization; +import forestry.core.utils.StringUtil; /** * @@ -74,10 +74,8 @@ public class ToolTip extends ForwardingList { } public static ToolTip buildToolTip(String tipTag, String... vars) { - if (!Localization.instance.hasMapping(tipTag)) - return null; ToolTip toolTip = new ToolTip(750); - String text = Localization.instance.get(tipTag); + String text = StringUtil.localize(tipTag); for (String var : vars) { String[] pair = var.split("="); text = text.replace(pair[0], pair[1]); diff --git a/forestry_common/core/forestry/core/gui/tooltips/ToolTipLine.java b/src/main/java/forestry/core/gui/tooltips/ToolTipLine.java similarity index 100% rename from forestry_common/core/forestry/core/gui/tooltips/ToolTipLine.java rename to src/main/java/forestry/core/gui/tooltips/ToolTipLine.java diff --git a/forestry_common/core/forestry/core/gui/widgets/ReservoirWidget.java b/src/main/java/forestry/core/gui/widgets/ReservoirWidget.java similarity index 100% rename from forestry_common/core/forestry/core/gui/widgets/ReservoirWidget.java rename to src/main/java/forestry/core/gui/widgets/ReservoirWidget.java diff --git a/forestry_common/core/forestry/core/gui/widgets/SocketWidget.java b/src/main/java/forestry/core/gui/widgets/SocketWidget.java similarity index 100% rename from forestry_common/core/forestry/core/gui/widgets/SocketWidget.java rename to src/main/java/forestry/core/gui/widgets/SocketWidget.java diff --git a/forestry_common/core/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java similarity index 98% rename from forestry_common/core/forestry/core/gui/widgets/TankWidget.java rename to src/main/java/forestry/core/gui/widgets/TankWidget.java index 0a8088803..3d987bf2d 100755 --- a/forestry_common/core/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -16,9 +16,9 @@ import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.tools.IToolPipette; import org.lwjgl.opengl.GL11; +import forestry.api.core.IToolPipette; import forestry.core.gui.ContainerForestry; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.WidgetManager; diff --git a/forestry_common/core/forestry/core/gui/widgets/Widget.java b/src/main/java/forestry/core/gui/widgets/Widget.java similarity index 100% rename from forestry_common/core/forestry/core/gui/widgets/Widget.java rename to src/main/java/forestry/core/gui/widgets/Widget.java diff --git a/forestry_common/core/forestry/core/interfaces/IBlockRenderer.java b/src/main/java/forestry/core/interfaces/IBlockRenderer.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IBlockRenderer.java rename to src/main/java/forestry/core/interfaces/IBlockRenderer.java diff --git a/forestry_common/core/forestry/core/interfaces/IClimatised.java b/src/main/java/forestry/core/interfaces/IClimatised.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IClimatised.java rename to src/main/java/forestry/core/interfaces/IClimatised.java diff --git a/forestry_common/core/forestry/core/interfaces/IContainerCrafting.java b/src/main/java/forestry/core/interfaces/IContainerCrafting.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IContainerCrafting.java rename to src/main/java/forestry/core/interfaces/IContainerCrafting.java diff --git a/forestry_common/core/forestry/core/interfaces/ICrafter.java b/src/main/java/forestry/core/interfaces/ICrafter.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/ICrafter.java rename to src/main/java/forestry/core/interfaces/ICrafter.java diff --git a/forestry_common/core/forestry/core/interfaces/ICraftingPlan.java b/src/main/java/forestry/core/interfaces/ICraftingPlan.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/ICraftingPlan.java rename to src/main/java/forestry/core/interfaces/ICraftingPlan.java diff --git a/forestry_common/core/forestry/core/interfaces/IDescriptiveRecipe.java b/src/main/java/forestry/core/interfaces/IDescriptiveRecipe.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IDescriptiveRecipe.java rename to src/main/java/forestry/core/interfaces/IDescriptiveRecipe.java diff --git a/forestry_common/core/forestry/core/interfaces/IErrorSource.java b/src/main/java/forestry/core/interfaces/IErrorSource.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IErrorSource.java rename to src/main/java/forestry/core/interfaces/IErrorSource.java diff --git a/forestry_common/core/forestry/core/interfaces/IHintSource.java b/src/main/java/forestry/core/interfaces/IHintSource.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IHintSource.java rename to src/main/java/forestry/core/interfaces/IHintSource.java diff --git a/forestry_common/core/forestry/core/interfaces/IInventoriedItem.java b/src/main/java/forestry/core/interfaces/IInventoriedItem.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IInventoriedItem.java rename to src/main/java/forestry/core/interfaces/IInventoriedItem.java diff --git a/forestry_common/core/forestry/core/interfaces/ILiquidTankContainer.java b/src/main/java/forestry/core/interfaces/ILiquidTankContainer.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/ILiquidTankContainer.java rename to src/main/java/forestry/core/interfaces/ILiquidTankContainer.java diff --git a/forestry_common/core/forestry/core/interfaces/IOreDictionaryHandler.java b/src/main/java/forestry/core/interfaces/IOreDictionaryHandler.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IOreDictionaryHandler.java rename to src/main/java/forestry/core/interfaces/IOreDictionaryHandler.java diff --git a/forestry_common/core/forestry/core/interfaces/IOwnable.java b/src/main/java/forestry/core/interfaces/IOwnable.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IOwnable.java rename to src/main/java/forestry/core/interfaces/IOwnable.java diff --git a/forestry_common/core/forestry/core/interfaces/IPacketHandler.java b/src/main/java/forestry/core/interfaces/IPacketHandler.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IPacketHandler.java rename to src/main/java/forestry/core/interfaces/IPacketHandler.java diff --git a/forestry_common/core/forestry/core/interfaces/IPickupHandler.java b/src/main/java/forestry/core/interfaces/IPickupHandler.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IPickupHandler.java rename to src/main/java/forestry/core/interfaces/IPickupHandler.java diff --git a/forestry_common/core/forestry/core/interfaces/IPowerHandler.java b/src/main/java/forestry/core/interfaces/IPowerHandler.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IPowerHandler.java rename to src/main/java/forestry/core/interfaces/IPowerHandler.java diff --git a/forestry_common/core/forestry/core/interfaces/IRenderableMachine.java b/src/main/java/forestry/core/interfaces/IRenderableMachine.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IRenderableMachine.java rename to src/main/java/forestry/core/interfaces/IRenderableMachine.java diff --git a/forestry_common/core/forestry/core/interfaces/IResupplyHandler.java b/src/main/java/forestry/core/interfaces/IResupplyHandler.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/IResupplyHandler.java rename to src/main/java/forestry/core/interfaces/IResupplyHandler.java diff --git a/forestry_common/core/forestry/core/interfaces/ISaveEventHandler.java b/src/main/java/forestry/core/interfaces/ISaveEventHandler.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/ISaveEventHandler.java rename to src/main/java/forestry/core/interfaces/ISaveEventHandler.java diff --git a/forestry_common/core/forestry/core/interfaces/ISocketable.java b/src/main/java/forestry/core/interfaces/ISocketable.java similarity index 100% rename from forestry_common/core/forestry/core/interfaces/ISocketable.java rename to src/main/java/forestry/core/interfaces/ISocketable.java diff --git a/forestry_common/core/forestry/core/inventory/ITileFilter.java b/src/main/java/forestry/core/inventory/ITileFilter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/ITileFilter.java rename to src/main/java/forestry/core/inventory/ITileFilter.java diff --git a/forestry_common/core/forestry/core/inventory/InvTools.java b/src/main/java/forestry/core/inventory/InvTools.java similarity index 99% rename from forestry_common/core/forestry/core/inventory/InvTools.java rename to src/main/java/forestry/core/inventory/InvTools.java index da145f378..550e8672d 100755 --- a/forestry_common/core/forestry/core/inventory/InvTools.java +++ b/src/main/java/forestry/core/inventory/InvTools.java @@ -32,9 +32,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; -import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.transport.PipeManager; +import forestry.api.core.ISpecialInventory; import forestry.core.inventory.filters.ArrayStackFilter; import forestry.core.inventory.filters.IStackFilter; import forestry.core.inventory.filters.InvertedStackFilter; diff --git a/forestry_common/core/forestry/core/inventory/InventoryConcatenator.java b/src/main/java/forestry/core/inventory/InventoryConcatenator.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/InventoryConcatenator.java rename to src/main/java/forestry/core/inventory/InventoryConcatenator.java diff --git a/forestry_common/core/forestry/core/inventory/InventorySorter.java b/src/main/java/forestry/core/inventory/InventorySorter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/InventorySorter.java rename to src/main/java/forestry/core/inventory/InventorySorter.java diff --git a/forestry_common/core/forestry/core/inventory/ItemStackMap.java b/src/main/java/forestry/core/inventory/ItemStackMap.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/ItemStackMap.java rename to src/main/java/forestry/core/inventory/ItemStackMap.java diff --git a/forestry_common/core/forestry/core/inventory/ItemStackSet.java b/src/main/java/forestry/core/inventory/ItemStackSet.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/ItemStackSet.java rename to src/main/java/forestry/core/inventory/ItemStackSet.java diff --git a/forestry_common/core/forestry/core/inventory/ItemStackSizeSorter.java b/src/main/java/forestry/core/inventory/ItemStackSizeSorter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/ItemStackSizeSorter.java rename to src/main/java/forestry/core/inventory/ItemStackSizeSorter.java diff --git a/forestry_common/core/forestry/core/inventory/filters/ArrayStackFilter.java b/src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/filters/ArrayStackFilter.java rename to src/main/java/forestry/core/inventory/filters/ArrayStackFilter.java diff --git a/forestry_common/core/forestry/core/inventory/filters/IStackFilter.java b/src/main/java/forestry/core/inventory/filters/IStackFilter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/filters/IStackFilter.java rename to src/main/java/forestry/core/inventory/filters/IStackFilter.java diff --git a/forestry_common/core/forestry/core/inventory/filters/InvertedStackFilter.java b/src/main/java/forestry/core/inventory/filters/InvertedStackFilter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/filters/InvertedStackFilter.java rename to src/main/java/forestry/core/inventory/filters/InvertedStackFilter.java diff --git a/forestry_common/core/forestry/core/inventory/filters/StackFilter.java b/src/main/java/forestry/core/inventory/filters/StackFilter.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/filters/StackFilter.java rename to src/main/java/forestry/core/inventory/filters/StackFilter.java diff --git a/forestry_common/core/forestry/core/inventory/manipulators/InventoryManipulator.java b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java similarity index 99% rename from forestry_common/core/forestry/core/inventory/manipulators/InventoryManipulator.java rename to src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java index 33300c41c..1d56df808 100755 --- a/forestry_common/core/forestry/core/inventory/manipulators/InventoryManipulator.java +++ b/src/main/java/forestry/core/inventory/manipulators/InventoryManipulator.java @@ -16,8 +16,7 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import buildcraft.api.inventory.ISpecialInventory; - +import forestry.api.core.ISpecialInventory; import forestry.core.inventory.InvTools; import forestry.core.inventory.filters.IStackFilter; import forestry.core.inventory.wrappers.IInvSlot; diff --git a/forestry_common/core/forestry/core/inventory/manipulators/SpecialManipulator.java b/src/main/java/forestry/core/inventory/manipulators/SpecialManipulator.java similarity index 98% rename from forestry_common/core/forestry/core/inventory/manipulators/SpecialManipulator.java rename to src/main/java/forestry/core/inventory/manipulators/SpecialManipulator.java index 62d4f8108..e9547b537 100755 --- a/forestry_common/core/forestry/core/inventory/manipulators/SpecialManipulator.java +++ b/src/main/java/forestry/core/inventory/manipulators/SpecialManipulator.java @@ -15,8 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.inventory.ISpecialInventory; - +import forestry.api.core.ISpecialInventory; import forestry.core.inventory.filters.IStackFilter; /** diff --git a/forestry_common/core/forestry/core/inventory/wrappers/ChestWrapper.java b/src/main/java/forestry/core/inventory/wrappers/ChestWrapper.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/ChestWrapper.java rename to src/main/java/forestry/core/inventory/wrappers/ChestWrapper.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/IInvSlot.java b/src/main/java/forestry/core/inventory/wrappers/IInvSlot.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/IInvSlot.java rename to src/main/java/forestry/core/inventory/wrappers/IInvSlot.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/InventoryCopy.java b/src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/InventoryCopy.java rename to src/main/java/forestry/core/inventory/wrappers/InventoryCopy.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/InventoryIterator.java b/src/main/java/forestry/core/inventory/wrappers/InventoryIterator.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/InventoryIterator.java rename to src/main/java/forestry/core/inventory/wrappers/InventoryIterator.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/InventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/InventoryMapper.java rename to src/main/java/forestry/core/inventory/wrappers/InventoryMapper.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/SidedInventoryIterator.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/SidedInventoryIterator.java rename to src/main/java/forestry/core/inventory/wrappers/SidedInventoryIterator.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/SidedInventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java similarity index 100% rename from forestry_common/core/forestry/core/inventory/wrappers/SidedInventoryMapper.java rename to src/main/java/forestry/core/inventory/wrappers/SidedInventoryMapper.java diff --git a/forestry_common/core/forestry/core/inventory/wrappers/SpecialInventoryMapper.java b/src/main/java/forestry/core/inventory/wrappers/SpecialInventoryMapper.java similarity index 96% rename from forestry_common/core/forestry/core/inventory/wrappers/SpecialInventoryMapper.java rename to src/main/java/forestry/core/inventory/wrappers/SpecialInventoryMapper.java index 06a416146..e84c74e98 100755 --- a/forestry_common/core/forestry/core/inventory/wrappers/SpecialInventoryMapper.java +++ b/src/main/java/forestry/core/inventory/wrappers/SpecialInventoryMapper.java @@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.inventory.ISpecialInventory; +import forestry.api.core.ISpecialInventory; /** * diff --git a/forestry_common/core/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemArmorNaturalist.java rename to src/main/java/forestry/core/items/ItemArmorNaturalist.java diff --git a/forestry_common/core/forestry/core/items/ItemAssemblyKit.java b/src/main/java/forestry/core/items/ItemAssemblyKit.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemAssemblyKit.java rename to src/main/java/forestry/core/items/ItemAssemblyKit.java diff --git a/forestry_common/core/forestry/core/items/ItemCrated.java b/src/main/java/forestry/core/items/ItemCrated.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemCrated.java rename to src/main/java/forestry/core/items/ItemCrated.java diff --git a/forestry_common/core/forestry/core/items/ItemForestry.java b/src/main/java/forestry/core/items/ItemForestry.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemForestry.java rename to src/main/java/forestry/core/items/ItemForestry.java diff --git a/forestry_common/core/forestry/core/items/ItemForestryBlock.java b/src/main/java/forestry/core/items/ItemForestryBlock.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemForestryBlock.java rename to src/main/java/forestry/core/items/ItemForestryBlock.java diff --git a/forestry_common/core/forestry/core/items/ItemForestryFood.java b/src/main/java/forestry/core/items/ItemForestryFood.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemForestryFood.java rename to src/main/java/forestry/core/items/ItemForestryFood.java diff --git a/forestry_common/core/forestry/core/items/ItemForestryPickaxe.java b/src/main/java/forestry/core/items/ItemForestryPickaxe.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemForestryPickaxe.java rename to src/main/java/forestry/core/items/ItemForestryPickaxe.java diff --git a/forestry_common/core/forestry/core/items/ItemForestryShovel.java b/src/main/java/forestry/core/items/ItemForestryShovel.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemForestryShovel.java rename to src/main/java/forestry/core/items/ItemForestryShovel.java diff --git a/forestry_common/core/forestry/core/items/ItemForestryTool.java b/src/main/java/forestry/core/items/ItemForestryTool.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemForestryTool.java rename to src/main/java/forestry/core/items/ItemForestryTool.java diff --git a/forestry_common/core/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemFruit.java rename to src/main/java/forestry/core/items/ItemFruit.java diff --git a/forestry_common/core/forestry/core/items/ItemInventoried.java b/src/main/java/forestry/core/items/ItemInventoried.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemInventoried.java rename to src/main/java/forestry/core/items/ItemInventoried.java diff --git a/forestry_common/core/forestry/core/items/ItemLiquidContainer.java b/src/main/java/forestry/core/items/ItemLiquidContainer.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemLiquidContainer.java rename to src/main/java/forestry/core/items/ItemLiquidContainer.java diff --git a/forestry_common/core/forestry/core/items/ItemLiquids.java b/src/main/java/forestry/core/items/ItemLiquids.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemLiquids.java rename to src/main/java/forestry/core/items/ItemLiquids.java diff --git a/forestry_common/core/forestry/core/items/ItemMisc.java b/src/main/java/forestry/core/items/ItemMisc.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemMisc.java rename to src/main/java/forestry/core/items/ItemMisc.java diff --git a/forestry_common/core/forestry/core/items/ItemNBTTile.java b/src/main/java/forestry/core/items/ItemNBTTile.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemNBTTile.java rename to src/main/java/forestry/core/items/ItemNBTTile.java diff --git a/forestry_common/core/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemOverlay.java rename to src/main/java/forestry/core/items/ItemOverlay.java diff --git a/forestry_common/core/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java similarity index 99% rename from forestry_common/core/forestry/core/items/ItemPipette.java rename to src/main/java/forestry/core/items/ItemPipette.java index 1db6eda3b..32e0edfd0 100755 --- a/forestry_common/core/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -23,9 +23,8 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.tools.IToolPipette; - import forestry.api.core.INBTTagable; +import forestry.api.core.IToolPipette; import forestry.core.config.Config; import forestry.core.config.Defaults; import forestry.core.render.TextureManager; diff --git a/forestry_common/core/forestry/core/items/ItemScoop.java b/src/main/java/forestry/core/items/ItemScoop.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemScoop.java rename to src/main/java/forestry/core/items/ItemScoop.java diff --git a/forestry_common/core/forestry/core/items/ItemWrench.java b/src/main/java/forestry/core/items/ItemWrench.java similarity index 100% rename from forestry_common/core/forestry/core/items/ItemWrench.java rename to src/main/java/forestry/core/items/ItemWrench.java diff --git a/forestry_common/core/forestry/core/network/ClassMap.java b/src/main/java/forestry/core/network/ClassMap.java similarity index 100% rename from forestry_common/core/forestry/core/network/ClassMap.java rename to src/main/java/forestry/core/network/ClassMap.java diff --git a/forestry_common/core/forestry/core/network/EntityNetData.java b/src/main/java/forestry/core/network/EntityNetData.java similarity index 100% rename from forestry_common/core/forestry/core/network/EntityNetData.java rename to src/main/java/forestry/core/network/EntityNetData.java diff --git a/forestry_common/core/forestry/core/network/ForestryPacket.java b/src/main/java/forestry/core/network/ForestryPacket.java similarity index 100% rename from forestry_common/core/forestry/core/network/ForestryPacket.java rename to src/main/java/forestry/core/network/ForestryPacket.java diff --git a/forestry_common/core/forestry/core/network/GuiId.java b/src/main/java/forestry/core/network/GuiId.java similarity index 100% rename from forestry_common/core/forestry/core/network/GuiId.java rename to src/main/java/forestry/core/network/GuiId.java diff --git a/forestry_common/core/forestry/core/network/ILocatedPacket.java b/src/main/java/forestry/core/network/ILocatedPacket.java similarity index 100% rename from forestry_common/core/forestry/core/network/ILocatedPacket.java rename to src/main/java/forestry/core/network/ILocatedPacket.java diff --git a/forestry_common/core/forestry/core/network/INetworkedEntity.java b/src/main/java/forestry/core/network/INetworkedEntity.java similarity index 100% rename from forestry_common/core/forestry/core/network/INetworkedEntity.java rename to src/main/java/forestry/core/network/INetworkedEntity.java diff --git a/forestry_common/core/forestry/core/network/IndexInPayload.java b/src/main/java/forestry/core/network/IndexInPayload.java similarity index 100% rename from forestry_common/core/forestry/core/network/IndexInPayload.java rename to src/main/java/forestry/core/network/IndexInPayload.java diff --git a/forestry_common/core/forestry/core/network/PacketCoordinates.java b/src/main/java/forestry/core/network/PacketCoordinates.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketCoordinates.java rename to src/main/java/forestry/core/network/PacketCoordinates.java diff --git a/forestry_common/core/forestry/core/network/PacketFXSignal.java b/src/main/java/forestry/core/network/PacketFXSignal.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketFXSignal.java rename to src/main/java/forestry/core/network/PacketFXSignal.java diff --git a/forestry_common/core/forestry/core/network/PacketHandler.java b/src/main/java/forestry/core/network/PacketHandler.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketHandler.java rename to src/main/java/forestry/core/network/PacketHandler.java diff --git a/forestry_common/core/forestry/core/network/PacketIds.java b/src/main/java/forestry/core/network/PacketIds.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketIds.java rename to src/main/java/forestry/core/network/PacketIds.java diff --git a/forestry_common/core/forestry/core/network/PacketInventoryStack.java b/src/main/java/forestry/core/network/PacketInventoryStack.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketInventoryStack.java rename to src/main/java/forestry/core/network/PacketInventoryStack.java diff --git a/forestry_common/core/forestry/core/network/PacketNBT.java b/src/main/java/forestry/core/network/PacketNBT.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketNBT.java rename to src/main/java/forestry/core/network/PacketNBT.java diff --git a/forestry_common/core/forestry/core/network/PacketPayload.java b/src/main/java/forestry/core/network/PacketPayload.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketPayload.java rename to src/main/java/forestry/core/network/PacketPayload.java diff --git a/forestry_common/core/forestry/core/network/PacketSocketUpdate.java b/src/main/java/forestry/core/network/PacketSocketUpdate.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketSocketUpdate.java rename to src/main/java/forestry/core/network/PacketSocketUpdate.java diff --git a/forestry_common/core/forestry/core/network/PacketTankUpdate.java b/src/main/java/forestry/core/network/PacketTankUpdate.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketTankUpdate.java rename to src/main/java/forestry/core/network/PacketTankUpdate.java diff --git a/forestry_common/core/forestry/core/network/PacketTileNBT.java b/src/main/java/forestry/core/network/PacketTileNBT.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketTileNBT.java rename to src/main/java/forestry/core/network/PacketTileNBT.java diff --git a/forestry_common/core/forestry/core/network/PacketTileUpdate.java b/src/main/java/forestry/core/network/PacketTileUpdate.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketTileUpdate.java rename to src/main/java/forestry/core/network/PacketTileUpdate.java diff --git a/forestry_common/core/forestry/core/network/PacketUpdate.java b/src/main/java/forestry/core/network/PacketUpdate.java similarity index 100% rename from forestry_common/core/forestry/core/network/PacketUpdate.java rename to src/main/java/forestry/core/network/PacketUpdate.java diff --git a/forestry_common/core/forestry/core/proxy/ClientProxyCommon.java b/src/main/java/forestry/core/proxy/ClientProxyCommon.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ClientProxyCommon.java rename to src/main/java/forestry/core/proxy/ClientProxyCommon.java diff --git a/forestry_common/core/forestry/core/proxy/ClientProxyNetwork.java b/src/main/java/forestry/core/proxy/ClientProxyNetwork.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ClientProxyNetwork.java rename to src/main/java/forestry/core/proxy/ClientProxyNetwork.java diff --git a/forestry_common/core/forestry/core/proxy/ClientProxyRender.java b/src/main/java/forestry/core/proxy/ClientProxyRender.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ClientProxyRender.java rename to src/main/java/forestry/core/proxy/ClientProxyRender.java diff --git a/forestry_common/core/forestry/core/proxy/Proxies.java b/src/main/java/forestry/core/proxy/Proxies.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/Proxies.java rename to src/main/java/forestry/core/proxy/Proxies.java diff --git a/forestry_common/core/forestry/core/proxy/ProxyCommon.java b/src/main/java/forestry/core/proxy/ProxyCommon.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ProxyCommon.java rename to src/main/java/forestry/core/proxy/ProxyCommon.java diff --git a/forestry_common/core/forestry/core/proxy/ProxyLog.java b/src/main/java/forestry/core/proxy/ProxyLog.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ProxyLog.java rename to src/main/java/forestry/core/proxy/ProxyLog.java diff --git a/forestry_common/core/forestry/core/proxy/ProxyNetwork.java b/src/main/java/forestry/core/proxy/ProxyNetwork.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ProxyNetwork.java rename to src/main/java/forestry/core/proxy/ProxyNetwork.java diff --git a/forestry_common/core/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java similarity index 100% rename from forestry_common/core/forestry/core/proxy/ProxyRender.java rename to src/main/java/forestry/core/proxy/ProxyRender.java diff --git a/forestry_common/core/forestry/core/render/BlockRenderingHandler.java b/src/main/java/forestry/core/render/BlockRenderingHandler.java similarity index 100% rename from forestry_common/core/forestry/core/render/BlockRenderingHandler.java rename to src/main/java/forestry/core/render/BlockRenderingHandler.java diff --git a/forestry_common/core/forestry/core/render/EntityBiodustFX.java b/src/main/java/forestry/core/render/EntityBiodustFX.java similarity index 100% rename from forestry_common/core/forestry/core/render/EntityBiodustFX.java rename to src/main/java/forestry/core/render/EntityBiodustFX.java diff --git a/forestry_common/core/forestry/core/render/EntityHoneydustFX.java b/src/main/java/forestry/core/render/EntityHoneydustFX.java similarity index 100% rename from forestry_common/core/forestry/core/render/EntityHoneydustFX.java rename to src/main/java/forestry/core/render/EntityHoneydustFX.java diff --git a/forestry_common/core/forestry/core/render/EntitySnowFX.java b/src/main/java/forestry/core/render/EntitySnowFX.java similarity index 100% rename from forestry_common/core/forestry/core/render/EntitySnowFX.java rename to src/main/java/forestry/core/render/EntitySnowFX.java diff --git a/forestry_common/core/forestry/core/render/ModelEscritoire.java b/src/main/java/forestry/core/render/ModelEscritoire.java similarity index 100% rename from forestry_common/core/forestry/core/render/ModelEscritoire.java rename to src/main/java/forestry/core/render/ModelEscritoire.java diff --git a/forestry_common/core/forestry/core/render/OverlayRenderingHandler.java b/src/main/java/forestry/core/render/OverlayRenderingHandler.java similarity index 100% rename from forestry_common/core/forestry/core/render/OverlayRenderingHandler.java rename to src/main/java/forestry/core/render/OverlayRenderingHandler.java diff --git a/forestry_common/core/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java similarity index 100% rename from forestry_common/core/forestry/core/render/RenderAnalyzer.java rename to src/main/java/forestry/core/render/RenderAnalyzer.java diff --git a/forestry_common/core/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java similarity index 100% rename from forestry_common/core/forestry/core/render/RenderEscritoire.java rename to src/main/java/forestry/core/render/RenderEscritoire.java diff --git a/forestry_common/core/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java similarity index 100% rename from forestry_common/core/forestry/core/render/RenderMachine.java rename to src/main/java/forestry/core/render/RenderMachine.java diff --git a/forestry_common/core/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java similarity index 100% rename from forestry_common/core/forestry/core/render/RenderMill.java rename to src/main/java/forestry/core/render/RenderMill.java diff --git a/forestry_common/core/forestry/core/render/SpriteSheet.java b/src/main/java/forestry/core/render/SpriteSheet.java similarity index 100% rename from forestry_common/core/forestry/core/render/SpriteSheet.java rename to src/main/java/forestry/core/render/SpriteSheet.java diff --git a/forestry_common/core/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java similarity index 100% rename from forestry_common/core/forestry/core/render/TextureManager.java rename to src/main/java/forestry/core/render/TextureManager.java diff --git a/forestry_common/core/forestry/core/render/TileRendererIndex.java b/src/main/java/forestry/core/render/TileRendererIndex.java similarity index 100% rename from forestry_common/core/forestry/core/render/TileRendererIndex.java rename to src/main/java/forestry/core/render/TileRendererIndex.java diff --git a/forestry_common/core/forestry/core/triggers/ForestryTrigger.java b/src/main/java/forestry/core/triggers/ForestryTrigger.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/ForestryTrigger.java rename to src/main/java/forestry/core/triggers/ForestryTrigger.java diff --git a/forestry_common/core/forestry/core/triggers/Trigger.java b/src/main/java/forestry/core/triggers/Trigger.java similarity index 94% rename from forestry_common/core/forestry/core/triggers/Trigger.java rename to src/main/java/forestry/core/triggers/Trigger.java index 740509b1f..5763cfa64 100755 --- a/forestry_common/core/forestry/core/triggers/Trigger.java +++ b/src/main/java/forestry/core/triggers/Trigger.java @@ -13,6 +13,7 @@ package forestry.core.triggers; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import buildcraft.api.gates.ITrigger; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -76,4 +77,9 @@ public abstract class Trigger implements ITileTrigger { public void registerIcons(IIconRegister register) { icon = TextureManager.getInstance().registerTex(register, "triggers/" + unlocalized.replace("trigger.", "")); } + + @Override + public ITrigger rotateLeft() { + return this; + } } diff --git a/forestry_common/core/forestry/core/triggers/TriggerHasWork.java b/src/main/java/forestry/core/triggers/TriggerHasWork.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerHasWork.java rename to src/main/java/forestry/core/triggers/TriggerHasWork.java diff --git a/forestry_common/core/forestry/core/triggers/TriggerLowFuel.java b/src/main/java/forestry/core/triggers/TriggerLowFuel.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerLowFuel.java rename to src/main/java/forestry/core/triggers/TriggerLowFuel.java diff --git a/forestry_common/core/forestry/core/triggers/TriggerLowGermlings.java b/src/main/java/forestry/core/triggers/TriggerLowGermlings.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerLowGermlings.java rename to src/main/java/forestry/core/triggers/TriggerLowGermlings.java diff --git a/forestry_common/core/forestry/core/triggers/TriggerLowResource.java b/src/main/java/forestry/core/triggers/TriggerLowResource.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerLowResource.java rename to src/main/java/forestry/core/triggers/TriggerLowResource.java diff --git a/forestry_common/core/forestry/core/triggers/TriggerLowSoil.java b/src/main/java/forestry/core/triggers/TriggerLowSoil.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerLowSoil.java rename to src/main/java/forestry/core/triggers/TriggerLowSoil.java diff --git a/forestry_common/core/forestry/core/triggers/TriggerMissingDrone.java b/src/main/java/forestry/core/triggers/TriggerMissingDrone.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerMissingDrone.java rename to src/main/java/forestry/core/triggers/TriggerMissingDrone.java diff --git a/forestry_common/core/forestry/core/triggers/TriggerMissingQueen.java b/src/main/java/forestry/core/triggers/TriggerMissingQueen.java similarity index 100% rename from forestry_common/core/forestry/core/triggers/TriggerMissingQueen.java rename to src/main/java/forestry/core/triggers/TriggerMissingQueen.java diff --git a/forestry_common/core/forestry/core/utils/BlockUtil.java b/src/main/java/forestry/core/utils/BlockUtil.java similarity index 100% rename from forestry_common/core/forestry/core/utils/BlockUtil.java rename to src/main/java/forestry/core/utils/BlockUtil.java diff --git a/forestry_common/core/forestry/core/utils/CommandMC.java b/src/main/java/forestry/core/utils/CommandMC.java similarity index 100% rename from forestry_common/core/forestry/core/utils/CommandMC.java rename to src/main/java/forestry/core/utils/CommandMC.java diff --git a/forestry_common/core/forestry/core/utils/DamageSourceForestry.java b/src/main/java/forestry/core/utils/DamageSourceForestry.java similarity index 100% rename from forestry_common/core/forestry/core/utils/DamageSourceForestry.java rename to src/main/java/forestry/core/utils/DamageSourceForestry.java diff --git a/forestry_common/core/forestry/core/utils/DelayTimer.java b/src/main/java/forestry/core/utils/DelayTimer.java similarity index 100% rename from forestry_common/core/forestry/core/utils/DelayTimer.java rename to src/main/java/forestry/core/utils/DelayTimer.java diff --git a/forestry_common/core/forestry/core/utils/EnumAccess.java b/src/main/java/forestry/core/utils/EnumAccess.java similarity index 100% rename from forestry_common/core/forestry/core/utils/EnumAccess.java rename to src/main/java/forestry/core/utils/EnumAccess.java diff --git a/forestry_common/core/forestry/core/utils/EnumTankLevel.java b/src/main/java/forestry/core/utils/EnumTankLevel.java similarity index 100% rename from forestry_common/core/forestry/core/utils/EnumTankLevel.java rename to src/main/java/forestry/core/utils/EnumTankLevel.java diff --git a/forestry_common/core/forestry/core/utils/FluidMap.java b/src/main/java/forestry/core/utils/FluidMap.java similarity index 100% rename from forestry_common/core/forestry/core/utils/FluidMap.java rename to src/main/java/forestry/core/utils/FluidMap.java diff --git a/forestry_common/core/forestry/core/utils/FluidStackMap.java b/src/main/java/forestry/core/utils/FluidStackMap.java similarity index 100% rename from forestry_common/core/forestry/core/utils/FluidStackMap.java rename to src/main/java/forestry/core/utils/FluidStackMap.java diff --git a/forestry_common/core/forestry/core/utils/Fluids.java b/src/main/java/forestry/core/utils/Fluids.java similarity index 100% rename from forestry_common/core/forestry/core/utils/Fluids.java rename to src/main/java/forestry/core/utils/Fluids.java diff --git a/forestry_common/core/forestry/core/utils/FontColour.java b/src/main/java/forestry/core/utils/FontColour.java similarity index 100% rename from forestry_common/core/forestry/core/utils/FontColour.java rename to src/main/java/forestry/core/utils/FontColour.java diff --git a/forestry_common/core/forestry/core/utils/ForestryModEnvWarningCallable.java b/src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java similarity index 100% rename from forestry_common/core/forestry/core/utils/ForestryModEnvWarningCallable.java rename to src/main/java/forestry/core/utils/ForestryModEnvWarningCallable.java diff --git a/forestry_common/core/forestry/core/utils/ForestryResource.java b/src/main/java/forestry/core/utils/ForestryResource.java similarity index 100% rename from forestry_common/core/forestry/core/utils/ForestryResource.java rename to src/main/java/forestry/core/utils/ForestryResource.java diff --git a/forestry_common/core/forestry/core/utils/ForestryTank.java b/src/main/java/forestry/core/utils/ForestryTank.java similarity index 100% rename from forestry_common/core/forestry/core/utils/ForestryTank.java rename to src/main/java/forestry/core/utils/ForestryTank.java diff --git a/forestry_common/core/forestry/core/utils/IDAllocator.java b/src/main/java/forestry/core/utils/IDAllocator.java similarity index 100% rename from forestry_common/core/forestry/core/utils/IDAllocator.java rename to src/main/java/forestry/core/utils/IDAllocator.java diff --git a/forestry_common/core/forestry/core/utils/InventoryAdapter.java b/src/main/java/forestry/core/utils/InventoryAdapter.java similarity index 100% rename from forestry_common/core/forestry/core/utils/InventoryAdapter.java rename to src/main/java/forestry/core/utils/InventoryAdapter.java diff --git a/forestry_common/core/forestry/core/utils/ItemInventory.java b/src/main/java/forestry/core/utils/ItemInventory.java similarity index 100% rename from forestry_common/core/forestry/core/utils/ItemInventory.java rename to src/main/java/forestry/core/utils/ItemInventory.java diff --git a/forestry_common/core/forestry/core/utils/ItemStackMap.java b/src/main/java/forestry/core/utils/ItemStackMap.java similarity index 100% rename from forestry_common/core/forestry/core/utils/ItemStackMap.java rename to src/main/java/forestry/core/utils/ItemStackMap.java diff --git a/forestry_common/core/forestry/core/utils/LiquidHelper.java b/src/main/java/forestry/core/utils/LiquidHelper.java similarity index 98% rename from forestry_common/core/forestry/core/utils/LiquidHelper.java rename to src/main/java/forestry/core/utils/LiquidHelper.java index 33026e2d1..bae4ba690 100755 --- a/forestry_common/core/forestry/core/utils/LiquidHelper.java +++ b/src/main/java/forestry/core/utils/LiquidHelper.java @@ -84,7 +84,6 @@ public class LiquidHelper { public static Fluid getOrCreateLiquid(String ident) { if (!FluidRegistry.isFluidRegistered(ident)) { Fluid fluid = new Fluid(ident); - LanguageRegistry.instance().addStringLocalization(fluid.getUnlocalizedName(), Localization.instance.get(fluid.getUnlocalizedName())); FluidRegistry.registerFluid(fluid); myLiquids.add(ident); } diff --git a/forestry_common/core/forestry/core/utils/Localization.java b/src/main/java/forestry/core/utils/Localization.java similarity index 97% rename from forestry_common/core/forestry/core/utils/Localization.java rename to src/main/java/forestry/core/utils/Localization.java index cf3ad441e..fcf669193 100755 --- a/forestry_common/core/forestry/core/utils/Localization.java +++ b/src/main/java/forestry/core/utils/Localization.java @@ -21,7 +21,10 @@ import forestry.core.proxy.Proxies; * * @author Jimeo Wan / modified for Forestry by SirSengir * @license Public domain + * + * @deprecated Switching to vanilla assets lang system */ +@Deprecated public class Localization { public static Localization instance = new Localization(); diff --git a/forestry_common/core/forestry/core/utils/PlainInventory.java b/src/main/java/forestry/core/utils/PlainInventory.java similarity index 100% rename from forestry_common/core/forestry/core/utils/PlainInventory.java rename to src/main/java/forestry/core/utils/PlainInventory.java diff --git a/forestry_common/core/forestry/core/utils/RecipeUtil.java b/src/main/java/forestry/core/utils/RecipeUtil.java similarity index 100% rename from forestry_common/core/forestry/core/utils/RecipeUtil.java rename to src/main/java/forestry/core/utils/RecipeUtil.java diff --git a/forestry_common/core/forestry/core/utils/Schemata.java b/src/main/java/forestry/core/utils/Schemata.java similarity index 100% rename from forestry_common/core/forestry/core/utils/Schemata.java rename to src/main/java/forestry/core/utils/Schemata.java diff --git a/forestry_common/core/forestry/core/utils/ShapedRecipeCustom.java b/src/main/java/forestry/core/utils/ShapedRecipeCustom.java similarity index 100% rename from forestry_common/core/forestry/core/utils/ShapedRecipeCustom.java rename to src/main/java/forestry/core/utils/ShapedRecipeCustom.java diff --git a/forestry_common/core/forestry/core/utils/StackMap.java b/src/main/java/forestry/core/utils/StackMap.java similarity index 100% rename from forestry_common/core/forestry/core/utils/StackMap.java rename to src/main/java/forestry/core/utils/StackMap.java diff --git a/forestry_common/core/forestry/core/utils/StackUtils.java b/src/main/java/forestry/core/utils/StackUtils.java similarity index 100% rename from forestry_common/core/forestry/core/utils/StackUtils.java rename to src/main/java/forestry/core/utils/StackUtils.java diff --git a/forestry_common/core/forestry/core/utils/StringUtil.java b/src/main/java/forestry/core/utils/StringUtil.java similarity index 90% rename from forestry_common/core/forestry/core/utils/StringUtil.java rename to src/main/java/forestry/core/utils/StringUtil.java index 1ed5b1611..35d79fb48 100755 --- a/forestry_common/core/forestry/core/utils/StringUtil.java +++ b/src/main/java/forestry/core/utils/StringUtil.java @@ -10,14 +10,16 @@ ******************************************************************************/ package forestry.core.utils; +import net.minecraft.util.StatCollector; + public class StringUtil { public static String localize(String key) { - return Localization.instance.get(key); + return StatCollector.translateToLocal(key); } public static String localizeAndFormat(String key, Object... args) { - return String.format(Localization.instance.get(key), args); + return StatCollector.translateToLocalFormatted(key, args); } public static String capitalize(String s) { diff --git a/forestry_common/core/forestry/core/utils/TileInventoryAdapter.java b/src/main/java/forestry/core/utils/TileInventoryAdapter.java similarity index 100% rename from forestry_common/core/forestry/core/utils/TileInventoryAdapter.java rename to src/main/java/forestry/core/utils/TileInventoryAdapter.java diff --git a/forestry_common/core/forestry/core/utils/Utils.java b/src/main/java/forestry/core/utils/Utils.java similarity index 100% rename from forestry_common/core/forestry/core/utils/Utils.java rename to src/main/java/forestry/core/utils/Utils.java diff --git a/forestry_common/core/forestry/core/utils/Vect.java b/src/main/java/forestry/core/utils/Vect.java similarity index 100% rename from forestry_common/core/forestry/core/utils/Vect.java rename to src/main/java/forestry/core/utils/Vect.java diff --git a/forestry_common/core/forestry/core/worldgen/BlockType.java b/src/main/java/forestry/core/worldgen/BlockType.java similarity index 100% rename from forestry_common/core/forestry/core/worldgen/BlockType.java rename to src/main/java/forestry/core/worldgen/BlockType.java diff --git a/forestry_common/core/forestry/core/worldgen/WorldGenBase.java b/src/main/java/forestry/core/worldgen/WorldGenBase.java similarity index 100% rename from forestry_common/core/forestry/core/worldgen/WorldGenBase.java rename to src/main/java/forestry/core/worldgen/WorldGenBase.java diff --git a/forestry_common/core/forestry/core/worldgen/WorldGenMinableMeta.java b/src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java similarity index 100% rename from forestry_common/core/forestry/core/worldgen/WorldGenMinableMeta.java rename to src/main/java/forestry/core/worldgen/WorldGenMinableMeta.java diff --git a/forestry_common/energy/forestry/energy/GuiHandlerEnergy.java b/src/main/java/forestry/energy/GuiHandlerEnergy.java similarity index 100% rename from forestry_common/energy/forestry/energy/GuiHandlerEnergy.java rename to src/main/java/forestry/energy/GuiHandlerEnergy.java diff --git a/forestry_common/energy/forestry/energy/circuits/CircuitElectricBoost.java b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java similarity index 100% rename from forestry_common/energy/forestry/energy/circuits/CircuitElectricBoost.java rename to src/main/java/forestry/energy/circuits/CircuitElectricBoost.java diff --git a/forestry_common/energy/forestry/energy/circuits/CircuitElectricChange.java b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java similarity index 100% rename from forestry_common/energy/forestry/energy/circuits/CircuitElectricChange.java rename to src/main/java/forestry/energy/circuits/CircuitElectricChange.java diff --git a/forestry_common/energy/forestry/energy/circuits/CircuitElectricChoke.java b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java similarity index 100% rename from forestry_common/energy/forestry/energy/circuits/CircuitElectricChoke.java rename to src/main/java/forestry/energy/circuits/CircuitElectricChoke.java diff --git a/forestry_common/energy/forestry/energy/circuits/CircuitElectricEfficiency.java b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java similarity index 100% rename from forestry_common/energy/forestry/energy/circuits/CircuitElectricEfficiency.java rename to src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java diff --git a/forestry_common/energy/forestry/energy/circuits/CircuitFireDampener.java b/src/main/java/forestry/energy/circuits/CircuitFireDampener.java similarity index 100% rename from forestry_common/energy/forestry/energy/circuits/CircuitFireDampener.java rename to src/main/java/forestry/energy/circuits/CircuitFireDampener.java diff --git a/forestry_common/energy/forestry/energy/gadgets/EngineBronze.java b/src/main/java/forestry/energy/gadgets/EngineBronze.java similarity index 99% rename from forestry_common/energy/forestry/energy/gadgets/EngineBronze.java rename to src/main/java/forestry/energy/gadgets/EngineBronze.java index afd4f202a..c8cdf1801 100755 --- a/forestry_common/energy/forestry/energy/gadgets/EngineBronze.java +++ b/src/main/java/forestry/energy/gadgets/EngineBronze.java @@ -22,9 +22,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.inventory.ISpecialInventory; - import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.fuels.EngineBronzeFuel; import forestry.api.fuels.FuelManager; import forestry.core.EnumErrorCode; diff --git a/forestry_common/energy/forestry/energy/gadgets/EngineClockwork.java b/src/main/java/forestry/energy/gadgets/EngineClockwork.java similarity index 100% rename from forestry_common/energy/forestry/energy/gadgets/EngineClockwork.java rename to src/main/java/forestry/energy/gadgets/EngineClockwork.java diff --git a/forestry_common/energy/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java similarity index 99% rename from forestry_common/energy/forestry/energy/gadgets/EngineCopper.java rename to src/main/java/forestry/energy/gadgets/EngineCopper.java index c49862437..7a0e74f6c 100755 --- a/forestry_common/energy/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -26,9 +26,9 @@ import cpw.mods.fml.common.registry.GameData; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; import forestry.core.EnumErrorCode; import forestry.core.TemperatureState; diff --git a/forestry_common/energy/forestry/energy/gadgets/EngineDefinition.java b/src/main/java/forestry/energy/gadgets/EngineDefinition.java similarity index 100% rename from forestry_common/energy/forestry/energy/gadgets/EngineDefinition.java rename to src/main/java/forestry/energy/gadgets/EngineDefinition.java diff --git a/forestry_common/energy/forestry/energy/gadgets/EngineTin.java b/src/main/java/forestry/energy/gadgets/EngineTin.java similarity index 100% rename from forestry_common/energy/forestry/energy/gadgets/EngineTin.java rename to src/main/java/forestry/energy/gadgets/EngineTin.java diff --git a/forestry_common/energy/forestry/energy/gadgets/MachineGenerator.java b/src/main/java/forestry/energy/gadgets/MachineGenerator.java similarity index 99% rename from forestry_common/energy/forestry/energy/gadgets/MachineGenerator.java rename to src/main/java/forestry/energy/gadgets/MachineGenerator.java index 03a028ec5..77444dba4 100755 --- a/forestry_common/energy/forestry/energy/gadgets/MachineGenerator.java +++ b/src/main/java/forestry/energy/gadgets/MachineGenerator.java @@ -20,10 +20,10 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.inventory.ISpecialInventory; import ic2.api.energy.prefab.BasicSource; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.fuels.GeneratorFuel; import forestry.core.EnumErrorCode; import forestry.core.config.Config; diff --git a/forestry_common/energy/forestry/energy/gui/ContainerEngineBronze.java b/src/main/java/forestry/energy/gui/ContainerEngineBronze.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/ContainerEngineBronze.java rename to src/main/java/forestry/energy/gui/ContainerEngineBronze.java diff --git a/forestry_common/energy/forestry/energy/gui/ContainerEngineCopper.java b/src/main/java/forestry/energy/gui/ContainerEngineCopper.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/ContainerEngineCopper.java rename to src/main/java/forestry/energy/gui/ContainerEngineCopper.java diff --git a/forestry_common/energy/forestry/energy/gui/ContainerEngineTin.java b/src/main/java/forestry/energy/gui/ContainerEngineTin.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/ContainerEngineTin.java rename to src/main/java/forestry/energy/gui/ContainerEngineTin.java diff --git a/forestry_common/energy/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/ContainerGenerator.java rename to src/main/java/forestry/energy/gui/ContainerGenerator.java diff --git a/forestry_common/energy/forestry/energy/gui/GuiEngine.java b/src/main/java/forestry/energy/gui/GuiEngine.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/GuiEngine.java rename to src/main/java/forestry/energy/gui/GuiEngine.java diff --git a/forestry_common/energy/forestry/energy/gui/GuiEngineBronze.java b/src/main/java/forestry/energy/gui/GuiEngineBronze.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/GuiEngineBronze.java rename to src/main/java/forestry/energy/gui/GuiEngineBronze.java diff --git a/forestry_common/energy/forestry/energy/gui/GuiEngineCopper.java b/src/main/java/forestry/energy/gui/GuiEngineCopper.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/GuiEngineCopper.java rename to src/main/java/forestry/energy/gui/GuiEngineCopper.java diff --git a/forestry_common/energy/forestry/energy/gui/GuiEngineTin.java b/src/main/java/forestry/energy/gui/GuiEngineTin.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/GuiEngineTin.java rename to src/main/java/forestry/energy/gui/GuiEngineTin.java diff --git a/forestry_common/energy/forestry/energy/gui/GuiGenerator.java b/src/main/java/forestry/energy/gui/GuiGenerator.java similarity index 100% rename from forestry_common/energy/forestry/energy/gui/GuiGenerator.java rename to src/main/java/forestry/energy/gui/GuiGenerator.java diff --git a/forestry_common/energy/forestry/energy/proxy/ClientProxyEnergy.java b/src/main/java/forestry/energy/proxy/ClientProxyEnergy.java similarity index 100% rename from forestry_common/energy/forestry/energy/proxy/ClientProxyEnergy.java rename to src/main/java/forestry/energy/proxy/ClientProxyEnergy.java diff --git a/forestry_common/energy/forestry/energy/proxy/ProxyEnergy.java b/src/main/java/forestry/energy/proxy/ProxyEnergy.java similarity index 100% rename from forestry_common/energy/forestry/energy/proxy/ProxyEnergy.java rename to src/main/java/forestry/energy/proxy/ProxyEnergy.java diff --git a/forestry_common/energy/forestry/energy/render/RenderEngine.java b/src/main/java/forestry/energy/render/RenderEngine.java similarity index 100% rename from forestry_common/energy/forestry/energy/render/RenderEngine.java rename to src/main/java/forestry/energy/render/RenderEngine.java diff --git a/forestry_common/factory/forestry/factory/GuiHandlerFactory.java b/src/main/java/forestry/factory/GuiHandlerFactory.java similarity index 100% rename from forestry_common/factory/forestry/factory/GuiHandlerFactory.java rename to src/main/java/forestry/factory/GuiHandlerFactory.java diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java similarity index 100% rename from forestry_common/factory/forestry/factory/gadgets/MachineBottler.java rename to src/main/java/forestry/factory/gadgets/MachineBottler.java diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineCarpenter.java b/src/main/java/forestry/factory/gadgets/MachineCarpenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/gadgets/MachineCarpenter.java rename to src/main/java/forestry/factory/gadgets/MachineCarpenter.java diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java similarity index 99% rename from forestry_common/factory/forestry/factory/gadgets/MachineCentrifuge.java rename to src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index 722def2e7..df664faeb 100755 --- a/forestry_common/factory/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -27,10 +27,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.power.PowerHandler; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ICentrifugeManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineFabricator.java b/src/main/java/forestry/factory/gadgets/MachineFabricator.java similarity index 99% rename from forestry_common/factory/forestry/factory/gadgets/MachineFabricator.java rename to src/main/java/forestry/factory/gadgets/MachineFabricator.java index aa3a58c04..989e27820 100755 --- a/forestry_common/factory/forestry/factory/gadgets/MachineFabricator.java +++ b/src/main/java/forestry/factory/gadgets/MachineFabricator.java @@ -25,10 +25,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.power.PowerHandler; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IFabricatorManager; import forestry.core.config.Defaults; import forestry.core.gadgets.TileBase; diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/gadgets/MachineFermenter.java rename to src/main/java/forestry/factory/gadgets/MachineFermenter.java diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java similarity index 99% rename from forestry_common/factory/forestry/factory/gadgets/MachineMoistener.java rename to src/main/java/forestry/factory/gadgets/MachineMoistener.java index 54d53c761..6ef2d0c4a 100755 --- a/forestry_common/factory/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -27,9 +27,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.IMoistenerManager; diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java similarity index 100% rename from forestry_common/factory/forestry/factory/gadgets/MachineRaintank.java rename to src/main/java/forestry/factory/gadgets/MachineRaintank.java diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineSqueezer.java b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java similarity index 99% rename from forestry_common/factory/forestry/factory/gadgets/MachineSqueezer.java rename to src/main/java/forestry/factory/gadgets/MachineSqueezer.java index 26c449bff..da55534c1 100755 --- a/forestry_common/factory/forestry/factory/gadgets/MachineSqueezer.java +++ b/src/main/java/forestry/factory/gadgets/MachineSqueezer.java @@ -29,10 +29,10 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.power.PowerHandler; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.recipes.ISqueezerManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; diff --git a/forestry_common/factory/forestry/factory/gadgets/MachineStill.java b/src/main/java/forestry/factory/gadgets/MachineStill.java similarity index 99% rename from forestry_common/factory/forestry/factory/gadgets/MachineStill.java rename to src/main/java/forestry/factory/gadgets/MachineStill.java index 713c6f6c4..f972240f5 100755 --- a/forestry_common/factory/forestry/factory/gadgets/MachineStill.java +++ b/src/main/java/forestry/factory/gadgets/MachineStill.java @@ -27,10 +27,10 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import buildcraft.api.power.PowerHandler; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.recipes.IStillManager; import forestry.core.EnumErrorCode; import forestry.core.config.Config; diff --git a/forestry_common/factory/forestry/factory/gadgets/MillRainmaker.java b/src/main/java/forestry/factory/gadgets/MillRainmaker.java similarity index 99% rename from forestry_common/factory/forestry/factory/gadgets/MillRainmaker.java rename to src/main/java/forestry/factory/gadgets/MillRainmaker.java index 1f192ec7a..75a349c33 100755 --- a/forestry_common/factory/forestry/factory/gadgets/MillRainmaker.java +++ b/src/main/java/forestry/factory/gadgets/MillRainmaker.java @@ -16,8 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.inventory.ISpecialInventory; - +import forestry.api.core.ISpecialInventory; import forestry.api.fuels.FuelManager; import forestry.api.fuels.RainSubstrate; import forestry.core.gadgets.Mill; diff --git a/forestry_common/factory/forestry/factory/gadgets/TileWorktable.java b/src/main/java/forestry/factory/gadgets/TileWorktable.java similarity index 100% rename from forestry_common/factory/forestry/factory/gadgets/TileWorktable.java rename to src/main/java/forestry/factory/gadgets/TileWorktable.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerBottler.java b/src/main/java/forestry/factory/gui/ContainerBottler.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerBottler.java rename to src/main/java/forestry/factory/gui/ContainerBottler.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerCarpenter.java b/src/main/java/forestry/factory/gui/ContainerCarpenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerCarpenter.java rename to src/main/java/forestry/factory/gui/ContainerCarpenter.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerCentrifuge.java b/src/main/java/forestry/factory/gui/ContainerCentrifuge.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerCentrifuge.java rename to src/main/java/forestry/factory/gui/ContainerCentrifuge.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerFabricator.java rename to src/main/java/forestry/factory/gui/ContainerFabricator.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerFermenter.java rename to src/main/java/forestry/factory/gui/ContainerFermenter.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerMoistener.java rename to src/main/java/forestry/factory/gui/ContainerMoistener.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerRaintank.java rename to src/main/java/forestry/factory/gui/ContainerRaintank.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerSqueezer.java b/src/main/java/forestry/factory/gui/ContainerSqueezer.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerSqueezer.java rename to src/main/java/forestry/factory/gui/ContainerSqueezer.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerStill.java b/src/main/java/forestry/factory/gui/ContainerStill.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerStill.java rename to src/main/java/forestry/factory/gui/ContainerStill.java diff --git a/forestry_common/factory/forestry/factory/gui/ContainerWorktable.java b/src/main/java/forestry/factory/gui/ContainerWorktable.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/ContainerWorktable.java rename to src/main/java/forestry/factory/gui/ContainerWorktable.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiBottler.java b/src/main/java/forestry/factory/gui/GuiBottler.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiBottler.java rename to src/main/java/forestry/factory/gui/GuiBottler.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiCarpenter.java b/src/main/java/forestry/factory/gui/GuiCarpenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiCarpenter.java rename to src/main/java/forestry/factory/gui/GuiCarpenter.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiCentrifuge.java b/src/main/java/forestry/factory/gui/GuiCentrifuge.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiCentrifuge.java rename to src/main/java/forestry/factory/gui/GuiCentrifuge.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiFabricator.java b/src/main/java/forestry/factory/gui/GuiFabricator.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiFabricator.java rename to src/main/java/forestry/factory/gui/GuiFabricator.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiFermenter.java b/src/main/java/forestry/factory/gui/GuiFermenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiFermenter.java rename to src/main/java/forestry/factory/gui/GuiFermenter.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiMoistener.java b/src/main/java/forestry/factory/gui/GuiMoistener.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiMoistener.java rename to src/main/java/forestry/factory/gui/GuiMoistener.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiRaintank.java b/src/main/java/forestry/factory/gui/GuiRaintank.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiRaintank.java rename to src/main/java/forestry/factory/gui/GuiRaintank.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiSqueezer.java b/src/main/java/forestry/factory/gui/GuiSqueezer.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiSqueezer.java rename to src/main/java/forestry/factory/gui/GuiSqueezer.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiStill.java b/src/main/java/forestry/factory/gui/GuiStill.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiStill.java rename to src/main/java/forestry/factory/gui/GuiStill.java diff --git a/forestry_common/factory/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/GuiWorktable.java rename to src/main/java/forestry/factory/gui/GuiWorktable.java diff --git a/forestry_common/factory/forestry/factory/gui/InventoryCraftingAuto.java b/src/main/java/forestry/factory/gui/InventoryCraftingAuto.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/InventoryCraftingAuto.java rename to src/main/java/forestry/factory/gui/InventoryCraftingAuto.java diff --git a/forestry_common/factory/forestry/factory/gui/SlotCraftMatrix.java b/src/main/java/forestry/factory/gui/SlotCraftMatrix.java similarity index 100% rename from forestry_common/factory/forestry/factory/gui/SlotCraftMatrix.java rename to src/main/java/forestry/factory/gui/SlotCraftMatrix.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideBottler.java b/src/main/java/forestry/factory/recipes/CraftGuideBottler.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideBottler.java rename to src/main/java/forestry/factory/recipes/CraftGuideBottler.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideCarpenter.java b/src/main/java/forestry/factory/recipes/CraftGuideCarpenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideCarpenter.java rename to src/main/java/forestry/factory/recipes/CraftGuideCarpenter.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideCentrifuge.java b/src/main/java/forestry/factory/recipes/CraftGuideCentrifuge.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideCentrifuge.java rename to src/main/java/forestry/factory/recipes/CraftGuideCentrifuge.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideCustomRecipes.java b/src/main/java/forestry/factory/recipes/CraftGuideCustomRecipes.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideCustomRecipes.java rename to src/main/java/forestry/factory/recipes/CraftGuideCustomRecipes.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideFabricator.java b/src/main/java/forestry/factory/recipes/CraftGuideFabricator.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideFabricator.java rename to src/main/java/forestry/factory/recipes/CraftGuideFabricator.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideFermenter.java b/src/main/java/forestry/factory/recipes/CraftGuideFermenter.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideFermenter.java rename to src/main/java/forestry/factory/recipes/CraftGuideFermenter.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideIntegration.java b/src/main/java/forestry/factory/recipes/CraftGuideIntegration.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideIntegration.java rename to src/main/java/forestry/factory/recipes/CraftGuideIntegration.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideSqueezer.java b/src/main/java/forestry/factory/recipes/CraftGuideSqueezer.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideSqueezer.java rename to src/main/java/forestry/factory/recipes/CraftGuideSqueezer.java diff --git a/forestry_common/factory/forestry/factory/recipes/CraftGuideStill.java b/src/main/java/forestry/factory/recipes/CraftGuideStill.java similarity index 100% rename from forestry_common/factory/forestry/factory/recipes/CraftGuideStill.java rename to src/main/java/forestry/factory/recipes/CraftGuideStill.java diff --git a/forestry_common/farming/forestry/farming/EventHandlerFarming.java b/src/main/java/forestry/farming/EventHandlerFarming.java similarity index 100% rename from forestry_common/farming/forestry/farming/EventHandlerFarming.java rename to src/main/java/forestry/farming/EventHandlerFarming.java diff --git a/forestry_common/farming/forestry/farming/FarmHelper.java b/src/main/java/forestry/farming/FarmHelper.java similarity index 100% rename from forestry_common/farming/forestry/farming/FarmHelper.java rename to src/main/java/forestry/farming/FarmHelper.java diff --git a/forestry_common/farming/forestry/farming/FarmTarget.java b/src/main/java/forestry/farming/FarmTarget.java similarity index 100% rename from forestry_common/farming/forestry/farming/FarmTarget.java rename to src/main/java/forestry/farming/FarmTarget.java diff --git a/forestry_common/farming/forestry/farming/GuiHandlerFarming.java b/src/main/java/forestry/farming/GuiHandlerFarming.java similarity index 100% rename from forestry_common/farming/forestry/farming/GuiHandlerFarming.java rename to src/main/java/forestry/farming/GuiHandlerFarming.java diff --git a/forestry_common/farming/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java similarity index 100% rename from forestry_common/farming/forestry/farming/circuits/CircuitFarmLogic.java rename to src/main/java/forestry/farming/circuits/CircuitFarmLogic.java diff --git a/forestry_common/farming/forestry/farming/gadgets/BlockFarm.java b/src/main/java/forestry/farming/gadgets/BlockFarm.java similarity index 99% rename from forestry_common/farming/forestry/farming/gadgets/BlockFarm.java rename to src/main/java/forestry/farming/gadgets/BlockFarm.java index de6ba908d..4a156aaca 100755 --- a/forestry_common/farming/forestry/farming/gadgets/BlockFarm.java +++ b/src/main/java/forestry/farming/gadgets/BlockFarm.java @@ -80,7 +80,7 @@ public class BlockFarm extends BlockStructure { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { int meta = world.getBlockMetadata(x, y, z); if (Proxies.common.isSimulating(world) && canHarvestBlock(player, meta)) { List drops = getDrops(world, x, y, z, 0, 0); diff --git a/forestry_common/farming/forestry/farming/gadgets/BlockMushroom.java b/src/main/java/forestry/farming/gadgets/BlockMushroom.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/BlockMushroom.java rename to src/main/java/forestry/farming/gadgets/BlockMushroom.java diff --git a/forestry_common/farming/forestry/farming/gadgets/StructureLogicFarm.java b/src/main/java/forestry/farming/gadgets/StructureLogicFarm.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/StructureLogicFarm.java rename to src/main/java/forestry/farming/gadgets/StructureLogicFarm.java diff --git a/forestry_common/farming/forestry/farming/gadgets/TileControl.java b/src/main/java/forestry/farming/gadgets/TileControl.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/TileControl.java rename to src/main/java/forestry/farming/gadgets/TileControl.java diff --git a/forestry_common/farming/forestry/farming/gadgets/TileFarm.java b/src/main/java/forestry/farming/gadgets/TileFarm.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/TileFarm.java rename to src/main/java/forestry/farming/gadgets/TileFarm.java diff --git a/forestry_common/farming/forestry/farming/gadgets/TileFarmPlain.java b/src/main/java/forestry/farming/gadgets/TileFarmPlain.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/TileFarmPlain.java rename to src/main/java/forestry/farming/gadgets/TileFarmPlain.java diff --git a/forestry_common/farming/forestry/farming/gadgets/TileGearbox.java b/src/main/java/forestry/farming/gadgets/TileGearbox.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/TileGearbox.java rename to src/main/java/forestry/farming/gadgets/TileGearbox.java diff --git a/forestry_common/farming/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/TileHatch.java rename to src/main/java/forestry/farming/gadgets/TileHatch.java diff --git a/forestry_common/farming/forestry/farming/gadgets/TileValve.java b/src/main/java/forestry/farming/gadgets/TileValve.java similarity index 100% rename from forestry_common/farming/forestry/farming/gadgets/TileValve.java rename to src/main/java/forestry/farming/gadgets/TileValve.java diff --git a/forestry_common/farming/forestry/farming/gui/ContainerFarm.java b/src/main/java/forestry/farming/gui/ContainerFarm.java similarity index 100% rename from forestry_common/farming/forestry/farming/gui/ContainerFarm.java rename to src/main/java/forestry/farming/gui/ContainerFarm.java diff --git a/forestry_common/farming/forestry/farming/gui/GuiFarm.java b/src/main/java/forestry/farming/gui/GuiFarm.java similarity index 100% rename from forestry_common/farming/forestry/farming/gui/GuiFarm.java rename to src/main/java/forestry/farming/gui/GuiFarm.java diff --git a/forestry_common/farming/forestry/farming/items/ItemFarmBlock.java b/src/main/java/forestry/farming/items/ItemFarmBlock.java similarity index 100% rename from forestry_common/farming/forestry/farming/items/ItemFarmBlock.java rename to src/main/java/forestry/farming/items/ItemFarmBlock.java diff --git a/forestry_common/farming/forestry/farming/logic/Crop.java b/src/main/java/forestry/farming/logic/Crop.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/Crop.java rename to src/main/java/forestry/farming/logic/Crop.java diff --git a/forestry_common/farming/forestry/farming/logic/CropBlock.java b/src/main/java/forestry/farming/logic/CropBlock.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/CropBlock.java rename to src/main/java/forestry/farming/logic/CropBlock.java diff --git a/forestry_common/farming/forestry/farming/logic/CropFruit.java b/src/main/java/forestry/farming/logic/CropFruit.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/CropFruit.java rename to src/main/java/forestry/farming/logic/CropFruit.java diff --git a/forestry_common/farming/forestry/farming/logic/CropPeat.java b/src/main/java/forestry/farming/logic/CropPeat.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/CropPeat.java rename to src/main/java/forestry/farming/logic/CropPeat.java diff --git a/forestry_common/farming/forestry/farming/logic/CropRubber.java b/src/main/java/forestry/farming/logic/CropRubber.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/CropRubber.java rename to src/main/java/forestry/farming/logic/CropRubber.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogic.java rename to src/main/java/forestry/farming/logic/FarmLogic.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicArboreal.java b/src/main/java/forestry/farming/logic/FarmLogicArboreal.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicArboreal.java rename to src/main/java/forestry/farming/logic/FarmLogicArboreal.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicCereal.java b/src/main/java/forestry/farming/logic/FarmLogicCereal.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicCereal.java rename to src/main/java/forestry/farming/logic/FarmLogicCereal.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicCocoa.java b/src/main/java/forestry/farming/logic/FarmLogicCocoa.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicCocoa.java rename to src/main/java/forestry/farming/logic/FarmLogicCocoa.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicCrops.java b/src/main/java/forestry/farming/logic/FarmLogicCrops.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicCrops.java rename to src/main/java/forestry/farming/logic/FarmLogicCrops.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicGourd.java b/src/main/java/forestry/farming/logic/FarmLogicGourd.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicGourd.java rename to src/main/java/forestry/farming/logic/FarmLogicGourd.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicHomogenous.java b/src/main/java/forestry/farming/logic/FarmLogicHomogenous.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicHomogenous.java rename to src/main/java/forestry/farming/logic/FarmLogicHomogenous.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicInfernal.java b/src/main/java/forestry/farming/logic/FarmLogicInfernal.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicInfernal.java rename to src/main/java/forestry/farming/logic/FarmLogicInfernal.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicOrchard.java b/src/main/java/forestry/farming/logic/FarmLogicOrchard.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicOrchard.java rename to src/main/java/forestry/farming/logic/FarmLogicOrchard.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicPeat.java b/src/main/java/forestry/farming/logic/FarmLogicPeat.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicPeat.java rename to src/main/java/forestry/farming/logic/FarmLogicPeat.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicPoale.java b/src/main/java/forestry/farming/logic/FarmLogicPoale.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicPoale.java rename to src/main/java/forestry/farming/logic/FarmLogicPoale.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicRubber.java b/src/main/java/forestry/farming/logic/FarmLogicRubber.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicRubber.java rename to src/main/java/forestry/farming/logic/FarmLogicRubber.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicShroom.java b/src/main/java/forestry/farming/logic/FarmLogicShroom.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicShroom.java rename to src/main/java/forestry/farming/logic/FarmLogicShroom.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicSucculent.java b/src/main/java/forestry/farming/logic/FarmLogicSucculent.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicSucculent.java rename to src/main/java/forestry/farming/logic/FarmLogicSucculent.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicVegetable.java b/src/main/java/forestry/farming/logic/FarmLogicVegetable.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicVegetable.java rename to src/main/java/forestry/farming/logic/FarmLogicVegetable.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmLogicWatered.java b/src/main/java/forestry/farming/logic/FarmLogicWatered.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmLogicWatered.java rename to src/main/java/forestry/farming/logic/FarmLogicWatered.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableCocoa.java b/src/main/java/forestry/farming/logic/FarmableCocoa.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableCocoa.java rename to src/main/java/forestry/farming/logic/FarmableCocoa.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableFarmCraftory.java b/src/main/java/forestry/farming/logic/FarmableFarmCraftory.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableFarmCraftory.java rename to src/main/java/forestry/farming/logic/FarmableFarmCraftory.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableGE.java b/src/main/java/forestry/farming/logic/FarmableGE.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableGE.java rename to src/main/java/forestry/farming/logic/FarmableGE.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableGenericCrop.java b/src/main/java/forestry/farming/logic/FarmableGenericCrop.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableGenericCrop.java rename to src/main/java/forestry/farming/logic/FarmableGenericCrop.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableGenericSapling.java b/src/main/java/forestry/farming/logic/FarmableGenericSapling.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableGenericSapling.java rename to src/main/java/forestry/farming/logic/FarmableGenericSapling.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableGourd.java b/src/main/java/forestry/farming/logic/FarmableGourd.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableGourd.java rename to src/main/java/forestry/farming/logic/FarmableGourd.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableStacked.java b/src/main/java/forestry/farming/logic/FarmableStacked.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableStacked.java rename to src/main/java/forestry/farming/logic/FarmableStacked.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableVanillaSapling.java b/src/main/java/forestry/farming/logic/FarmableVanillaSapling.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableVanillaSapling.java rename to src/main/java/forestry/farming/logic/FarmableVanillaSapling.java diff --git a/forestry_common/farming/forestry/farming/logic/FarmableVanillaShroom.java b/src/main/java/forestry/farming/logic/FarmableVanillaShroom.java similarity index 100% rename from forestry_common/farming/forestry/farming/logic/FarmableVanillaShroom.java rename to src/main/java/forestry/farming/logic/FarmableVanillaShroom.java diff --git a/forestry_common/farming/forestry/farming/proxy/ClientProxyFarming.java b/src/main/java/forestry/farming/proxy/ClientProxyFarming.java similarity index 89% rename from forestry_common/farming/forestry/farming/proxy/ClientProxyFarming.java rename to src/main/java/forestry/farming/proxy/ClientProxyFarming.java index ec93065e8..d104e3ee3 100755 --- a/forestry_common/farming/forestry/farming/proxy/ClientProxyFarming.java +++ b/src/main/java/forestry/farming/proxy/ClientProxyFarming.java @@ -17,7 +17,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraftforge.client.MinecraftForgeClient; import forestry.core.config.ForestryBlock; -import forestry.core.utils.Localization; import forestry.farming.render.FarmItemRenderer; import forestry.farming.render.FarmRenderingHandler; import forestry.plugins.PluginFarming; @@ -31,10 +30,4 @@ public class ClientProxyFarming extends ProxyFarming { RenderingRegistry.registerBlockHandler(new FarmRenderingHandler()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ForestryBlock.farm), new FarmItemRenderer()); } - - @Override - public void addLocalizations() { - Localization.instance.addLocalization("/lang/forestry/farming/"); - } - } diff --git a/forestry_common/farming/forestry/farming/proxy/ProxyFarming.java b/src/main/java/forestry/farming/proxy/ProxyFarming.java similarity index 94% rename from forestry_common/farming/forestry/farming/proxy/ProxyFarming.java rename to src/main/java/forestry/farming/proxy/ProxyFarming.java index 20378f137..dc0230dfc 100755 --- a/forestry_common/farming/forestry/farming/proxy/ProxyFarming.java +++ b/src/main/java/forestry/farming/proxy/ProxyFarming.java @@ -14,8 +14,4 @@ public class ProxyFarming { public void initializeRendering() { } - - public void addLocalizations() { - } - } diff --git a/forestry_common/farming/forestry/farming/render/FarmItemRenderer.java b/src/main/java/forestry/farming/render/FarmItemRenderer.java similarity index 100% rename from forestry_common/farming/forestry/farming/render/FarmItemRenderer.java rename to src/main/java/forestry/farming/render/FarmItemRenderer.java diff --git a/forestry_common/farming/forestry/farming/render/FarmRenderingHandler.java b/src/main/java/forestry/farming/render/FarmRenderingHandler.java similarity index 100% rename from forestry_common/farming/forestry/farming/render/FarmRenderingHandler.java rename to src/main/java/forestry/farming/render/FarmRenderingHandler.java diff --git a/forestry_common/farming/forestry/farming/triggers/TriggerLowFertilizer.java b/src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java similarity index 100% rename from forestry_common/farming/forestry/farming/triggers/TriggerLowFertilizer.java rename to src/main/java/forestry/farming/triggers/TriggerLowFertilizer.java diff --git a/forestry_common/farming/forestry/farming/triggers/TriggerLowLiquid.java b/src/main/java/forestry/farming/triggers/TriggerLowLiquid.java similarity index 100% rename from forestry_common/farming/forestry/farming/triggers/TriggerLowLiquid.java rename to src/main/java/forestry/farming/triggers/TriggerLowLiquid.java diff --git a/forestry_common/farming/forestry/farming/triggers/TriggerLowSoil.java b/src/main/java/forestry/farming/triggers/TriggerLowSoil.java similarity index 100% rename from forestry_common/farming/forestry/farming/triggers/TriggerLowSoil.java rename to src/main/java/forestry/farming/triggers/TriggerLowSoil.java diff --git a/forestry_common/farming/forestry/farming/worldgen/WorldGenBigMushroom.java b/src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java similarity index 100% rename from forestry_common/farming/forestry/farming/worldgen/WorldGenBigMushroom.java rename to src/main/java/forestry/farming/worldgen/WorldGenBigMushroom.java diff --git a/forestry_common/food/forestry/food/BeverageEffect.java b/src/main/java/forestry/food/BeverageEffect.java similarity index 100% rename from forestry_common/food/forestry/food/BeverageEffect.java rename to src/main/java/forestry/food/BeverageEffect.java diff --git a/forestry_common/food/forestry/food/BeverageEffectAntidote.java b/src/main/java/forestry/food/BeverageEffectAntidote.java similarity index 100% rename from forestry_common/food/forestry/food/BeverageEffectAntidote.java rename to src/main/java/forestry/food/BeverageEffectAntidote.java diff --git a/forestry_common/food/forestry/food/BeverageEffectDrunk.java b/src/main/java/forestry/food/BeverageEffectDrunk.java similarity index 100% rename from forestry_common/food/forestry/food/BeverageEffectDrunk.java rename to src/main/java/forestry/food/BeverageEffectDrunk.java diff --git a/forestry_common/food/forestry/food/GuiHandlerFood.java b/src/main/java/forestry/food/GuiHandlerFood.java similarity index 100% rename from forestry_common/food/forestry/food/GuiHandlerFood.java rename to src/main/java/forestry/food/GuiHandlerFood.java diff --git a/forestry_common/food/forestry/food/gui/ContainerInfuser.java b/src/main/java/forestry/food/gui/ContainerInfuser.java similarity index 100% rename from forestry_common/food/forestry/food/gui/ContainerInfuser.java rename to src/main/java/forestry/food/gui/ContainerInfuser.java diff --git a/forestry_common/food/forestry/food/gui/GuiInfuser.java b/src/main/java/forestry/food/gui/GuiInfuser.java similarity index 100% rename from forestry_common/food/forestry/food/gui/GuiInfuser.java rename to src/main/java/forestry/food/gui/GuiInfuser.java diff --git a/forestry_common/food/forestry/food/items/ItemAmbrosia.java b/src/main/java/forestry/food/items/ItemAmbrosia.java similarity index 94% rename from forestry_common/food/forestry/food/items/ItemAmbrosia.java rename to src/main/java/forestry/food/items/ItemAmbrosia.java index 85bc63f9b..5c9acb1d8 100755 --- a/forestry_common/food/forestry/food/items/ItemAmbrosia.java +++ b/src/main/java/forestry/food/items/ItemAmbrosia.java @@ -25,7 +25,7 @@ public class ItemAmbrosia extends ItemForestryFood { } @Override - public boolean hasEffect(ItemStack itemstack) { + public boolean hasEffect(ItemStack itemstack, int pass) { return true; } diff --git a/forestry_common/food/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java similarity index 100% rename from forestry_common/food/forestry/food/items/ItemBeverage.java rename to src/main/java/forestry/food/items/ItemBeverage.java diff --git a/forestry_common/food/forestry/food/items/ItemInfuser.java b/src/main/java/forestry/food/items/ItemInfuser.java similarity index 100% rename from forestry_common/food/forestry/food/items/ItemInfuser.java rename to src/main/java/forestry/food/items/ItemInfuser.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/ButterflySpawner.java b/src/main/java/forestry/lepidopterology/ButterflySpawner.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/ButterflySpawner.java rename to src/main/java/forestry/lepidopterology/ButterflySpawner.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/GuiHandlerLepidopterology.java b/src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/GuiHandlerLepidopterology.java rename to src/main/java/forestry/lepidopterology/GuiHandlerLepidopterology.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/MatingRecipe.java b/src/main/java/forestry/lepidopterology/MatingRecipe.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/MatingRecipe.java rename to src/main/java/forestry/lepidopterology/MatingRecipe.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyBase.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyBase.java rename to src/main/java/forestry/lepidopterology/entities/AIButterflyBase.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyFlee.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyFlee.java rename to src/main/java/forestry/lepidopterology/entities/AIButterflyFlee.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyInteract.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyInteract.java rename to src/main/java/forestry/lepidopterology/entities/AIButterflyInteract.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyRest.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyRest.java rename to src/main/java/forestry/lepidopterology/entities/AIButterflyRest.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyWander.java b/src/main/java/forestry/lepidopterology/entities/AIButterflyWander.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/entities/AIButterflyWander.java rename to src/main/java/forestry/lepidopterology/entities/AIButterflyWander.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/entities/EntityButterfly.java rename to src/main/java/forestry/lepidopterology/entities/EntityButterfly.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/gadgets/TileLepidopteristChest.java b/src/main/java/forestry/lepidopterology/gadgets/TileLepidopteristChest.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/gadgets/TileLepidopteristChest.java rename to src/main/java/forestry/lepidopterology/gadgets/TileLepidopteristChest.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/AlleleButterflySpecies.java rename to src/main/java/forestry/lepidopterology/genetics/AlleleButterflySpecies.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/AlleleEffectNone.java b/src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/AlleleEffectNone.java rename to src/main/java/forestry/lepidopterology/genetics/AlleleEffectNone.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/Butterfly.java b/src/main/java/forestry/lepidopterology/genetics/Butterfly.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/Butterfly.java rename to src/main/java/forestry/lepidopterology/genetics/Butterfly.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/ButterflyGenome.java rename to src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/ButterflyHelper.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/ButterflyHelper.java rename to src/main/java/forestry/lepidopterology/genetics/ButterflyHelper.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/ButterflyTemplates.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyTemplates.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/ButterflyTemplates.java rename to src/main/java/forestry/lepidopterology/genetics/ButterflyTemplates.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/genetics/LepidopteristTracker.java b/src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/genetics/LepidopteristTracker.java rename to src/main/java/forestry/lepidopterology/genetics/LepidopteristTracker.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/gui/ContainerFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/gui/ContainerFlutterlyzer.java rename to src/main/java/forestry/lepidopterology/gui/ContainerFlutterlyzer.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/gui/GuiFlutterlyzer.java b/src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/gui/GuiFlutterlyzer.java rename to src/main/java/forestry/lepidopterology/gui/GuiFlutterlyzer.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/items/ItemButterflyGE.java rename to src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/items/ItemFlutterlyzer.java b/src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/items/ItemFlutterlyzer.java rename to src/main/java/forestry/lepidopterology/items/ItemFlutterlyzer.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java b/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java similarity index 88% rename from forestry_common/lepidopterology/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java rename to src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java index 3bd3a6fe2..d2b1f94da 100755 --- a/forestry_common/lepidopterology/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/proxy/ClientProxyLepidopterology.java @@ -15,7 +15,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraftforge.client.MinecraftForgeClient; import forestry.core.config.ForestryItem; -import forestry.core.utils.Localization; import forestry.lepidopterology.entities.EntityButterfly; import forestry.lepidopterology.render.ButterflyItemRenderer; import forestry.lepidopterology.render.RenderButterfly; @@ -27,10 +26,4 @@ public class ClientProxyLepidopterology extends ProxyLepidopterology { RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, new RenderButterfly()); MinecraftForgeClient.registerItemRenderer(ForestryItem.butterflyGE.item(), new ButterflyItemRenderer()); } - - @Override - public void addLocalizations() { - Localization.instance.addLocalization("/lang/forestry/lepidopterology/"); - } - } diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/proxy/ProxyLepidopterology.java b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java similarity index 94% rename from forestry_common/lepidopterology/forestry/lepidopterology/proxy/ProxyLepidopterology.java rename to src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java index dbca86a6d..04ea9ca52 100755 --- a/forestry_common/lepidopterology/forestry/lepidopterology/proxy/ProxyLepidopterology.java +++ b/src/main/java/forestry/lepidopterology/proxy/ProxyLepidopterology.java @@ -14,8 +14,4 @@ public class ProxyLepidopterology { public void initializeRendering() { } - - public void addLocalizations() { - } - } diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/render/ButterflyItemRenderer.java b/src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/render/ButterflyItemRenderer.java rename to src/main/java/forestry/lepidopterology/render/ButterflyItemRenderer.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/render/ModelButterfly.java rename to src/main/java/forestry/lepidopterology/render/ModelButterfly.java diff --git a/forestry_common/lepidopterology/forestry/lepidopterology/render/RenderButterfly.java b/src/main/java/forestry/lepidopterology/render/RenderButterfly.java similarity index 100% rename from forestry_common/lepidopterology/forestry/lepidopterology/render/RenderButterfly.java rename to src/main/java/forestry/lepidopterology/render/RenderButterfly.java diff --git a/forestry_common/mail/forestry/mail/CommandMail.java b/src/main/java/forestry/mail/CommandMail.java similarity index 100% rename from forestry_common/mail/forestry/mail/CommandMail.java rename to src/main/java/forestry/mail/CommandMail.java diff --git a/forestry_common/mail/forestry/mail/EnumAddressee.java b/src/main/java/forestry/mail/EnumAddressee.java similarity index 100% rename from forestry_common/mail/forestry/mail/EnumAddressee.java rename to src/main/java/forestry/mail/EnumAddressee.java diff --git a/forestry_common/mail/forestry/mail/EnumDeliveryState.java b/src/main/java/forestry/mail/EnumDeliveryState.java similarity index 100% rename from forestry_common/mail/forestry/mail/EnumDeliveryState.java rename to src/main/java/forestry/mail/EnumDeliveryState.java diff --git a/forestry_common/mail/forestry/mail/EnumStationState.java b/src/main/java/forestry/mail/EnumStationState.java similarity index 100% rename from forestry_common/mail/forestry/mail/EnumStationState.java rename to src/main/java/forestry/mail/EnumStationState.java diff --git a/forestry_common/mail/forestry/mail/GuiHandlerMail.java b/src/main/java/forestry/mail/GuiHandlerMail.java similarity index 100% rename from forestry_common/mail/forestry/mail/GuiHandlerMail.java rename to src/main/java/forestry/mail/GuiHandlerMail.java diff --git a/forestry_common/mail/forestry/mail/IMailContainer.java b/src/main/java/forestry/mail/IMailContainer.java similarity index 100% rename from forestry_common/mail/forestry/mail/IMailContainer.java rename to src/main/java/forestry/mail/IMailContainer.java diff --git a/forestry_common/mail/forestry/mail/Letter.java b/src/main/java/forestry/mail/Letter.java similarity index 100% rename from forestry_common/mail/forestry/mail/Letter.java rename to src/main/java/forestry/mail/Letter.java diff --git a/forestry_common/mail/forestry/mail/POBox.java b/src/main/java/forestry/mail/POBox.java similarity index 100% rename from forestry_common/mail/forestry/mail/POBox.java rename to src/main/java/forestry/mail/POBox.java diff --git a/forestry_common/mail/forestry/mail/POBoxInfo.java b/src/main/java/forestry/mail/POBoxInfo.java similarity index 100% rename from forestry_common/mail/forestry/mail/POBoxInfo.java rename to src/main/java/forestry/mail/POBoxInfo.java diff --git a/forestry_common/mail/forestry/mail/PacketHandlerMail.java b/src/main/java/forestry/mail/PacketHandlerMail.java similarity index 100% rename from forestry_common/mail/forestry/mail/PacketHandlerMail.java rename to src/main/java/forestry/mail/PacketHandlerMail.java diff --git a/forestry_common/mail/forestry/mail/PostOffice.java b/src/main/java/forestry/mail/PostOffice.java similarity index 100% rename from forestry_common/mail/forestry/mail/PostOffice.java rename to src/main/java/forestry/mail/PostOffice.java diff --git a/forestry_common/mail/forestry/mail/PostRegistry.java b/src/main/java/forestry/mail/PostRegistry.java similarity index 100% rename from forestry_common/mail/forestry/mail/PostRegistry.java rename to src/main/java/forestry/mail/PostRegistry.java diff --git a/forestry_common/mail/forestry/mail/PostalCarrier.java b/src/main/java/forestry/mail/PostalCarrier.java similarity index 100% rename from forestry_common/mail/forestry/mail/PostalCarrier.java rename to src/main/java/forestry/mail/PostalCarrier.java diff --git a/forestry_common/mail/forestry/mail/SaveEventHandlerMail.java b/src/main/java/forestry/mail/SaveEventHandlerMail.java similarity index 100% rename from forestry_common/mail/forestry/mail/SaveEventHandlerMail.java rename to src/main/java/forestry/mail/SaveEventHandlerMail.java diff --git a/forestry_common/mail/forestry/mail/TickHandlerMailClient.java b/src/main/java/forestry/mail/TickHandlerMailClient.java similarity index 100% rename from forestry_common/mail/forestry/mail/TickHandlerMailClient.java rename to src/main/java/forestry/mail/TickHandlerMailClient.java diff --git a/forestry_common/mail/forestry/mail/TradeStation.java b/src/main/java/forestry/mail/TradeStation.java similarity index 100% rename from forestry_common/mail/forestry/mail/TradeStation.java rename to src/main/java/forestry/mail/TradeStation.java diff --git a/forestry_common/mail/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java similarity index 99% rename from forestry_common/mail/forestry/mail/gadgets/MachineMailbox.java rename to src/main/java/forestry/mail/gadgets/MachineMailbox.java index a8a14a726..6097ee524 100755 --- a/forestry_common/mail/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -22,9 +22,9 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.mail.ILetter; import forestry.api.mail.IPostalState; import forestry.api.mail.PostManager; diff --git a/forestry_common/mail/forestry/mail/gadgets/MachinePhilatelist.java b/src/main/java/forestry/mail/gadgets/MachinePhilatelist.java similarity index 100% rename from forestry_common/mail/forestry/mail/gadgets/MachinePhilatelist.java rename to src/main/java/forestry/mail/gadgets/MachinePhilatelist.java diff --git a/forestry_common/mail/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java similarity index 99% rename from forestry_common/mail/forestry/mail/gadgets/MachineTrader.java rename to src/main/java/forestry/mail/gadgets/MachineTrader.java index 8e5a02aab..81bccf1d9 100755 --- a/forestry_common/mail/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -23,10 +23,10 @@ import net.minecraft.nbt.NBTUtil; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.gates.ITrigger; -import buildcraft.api.inventory.ISpecialInventory; import com.mojang.authlib.GameProfile; import forestry.api.core.ForestryAPI; +import forestry.api.core.ISpecialInventory; import forestry.api.mail.IStamps; import forestry.api.mail.PostManager; import forestry.core.EnumErrorCode; diff --git a/forestry_common/mail/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/ContainerCatalogue.java rename to src/main/java/forestry/mail/gui/ContainerCatalogue.java diff --git a/forestry_common/mail/forestry/mail/gui/ContainerLetter.java b/src/main/java/forestry/mail/gui/ContainerLetter.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/ContainerLetter.java rename to src/main/java/forestry/mail/gui/ContainerLetter.java diff --git a/forestry_common/mail/forestry/mail/gui/ContainerMailbox.java b/src/main/java/forestry/mail/gui/ContainerMailbox.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/ContainerMailbox.java rename to src/main/java/forestry/mail/gui/ContainerMailbox.java diff --git a/forestry_common/mail/forestry/mail/gui/ContainerPhilatelist.java b/src/main/java/forestry/mail/gui/ContainerPhilatelist.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/ContainerPhilatelist.java rename to src/main/java/forestry/mail/gui/ContainerPhilatelist.java diff --git a/forestry_common/mail/forestry/mail/gui/ContainerTradeName.java b/src/main/java/forestry/mail/gui/ContainerTradeName.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/ContainerTradeName.java rename to src/main/java/forestry/mail/gui/ContainerTradeName.java diff --git a/forestry_common/mail/forestry/mail/gui/ContainerTrader.java b/src/main/java/forestry/mail/gui/ContainerTrader.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/ContainerTrader.java rename to src/main/java/forestry/mail/gui/ContainerTrader.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiCatalogue.java b/src/main/java/forestry/mail/gui/GuiCatalogue.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiCatalogue.java rename to src/main/java/forestry/mail/gui/GuiCatalogue.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiLetter.java rename to src/main/java/forestry/mail/gui/GuiLetter.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiMailbox.java b/src/main/java/forestry/mail/gui/GuiMailbox.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiMailbox.java rename to src/main/java/forestry/mail/gui/GuiMailbox.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiMailboxInfo.java b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiMailboxInfo.java rename to src/main/java/forestry/mail/gui/GuiMailboxInfo.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiPhilatelist.java b/src/main/java/forestry/mail/gui/GuiPhilatelist.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiPhilatelist.java rename to src/main/java/forestry/mail/gui/GuiPhilatelist.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiTradeName.java b/src/main/java/forestry/mail/gui/GuiTradeName.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiTradeName.java rename to src/main/java/forestry/mail/gui/GuiTradeName.java diff --git a/forestry_common/mail/forestry/mail/gui/GuiTrader.java b/src/main/java/forestry/mail/gui/GuiTrader.java similarity index 100% rename from forestry_common/mail/forestry/mail/gui/GuiTrader.java rename to src/main/java/forestry/mail/gui/GuiTrader.java diff --git a/forestry_common/mail/forestry/mail/items/ItemCatalogue.java b/src/main/java/forestry/mail/items/ItemCatalogue.java similarity index 100% rename from forestry_common/mail/forestry/mail/items/ItemCatalogue.java rename to src/main/java/forestry/mail/items/ItemCatalogue.java diff --git a/forestry_common/mail/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java similarity index 100% rename from forestry_common/mail/forestry/mail/items/ItemLetter.java rename to src/main/java/forestry/mail/items/ItemLetter.java diff --git a/forestry_common/mail/forestry/mail/items/ItemStamps.java b/src/main/java/forestry/mail/items/ItemStamps.java similarity index 100% rename from forestry_common/mail/forestry/mail/items/ItemStamps.java rename to src/main/java/forestry/mail/items/ItemStamps.java diff --git a/forestry_common/mail/forestry/mail/network/PacketPOBoxInfo.java b/src/main/java/forestry/mail/network/PacketPOBoxInfo.java similarity index 100% rename from forestry_common/mail/forestry/mail/network/PacketPOBoxInfo.java rename to src/main/java/forestry/mail/network/PacketPOBoxInfo.java diff --git a/forestry_common/mail/forestry/mail/network/PacketTradeInfo.java b/src/main/java/forestry/mail/network/PacketTradeInfo.java similarity index 100% rename from forestry_common/mail/forestry/mail/network/PacketTradeInfo.java rename to src/main/java/forestry/mail/network/PacketTradeInfo.java diff --git a/forestry_common/mail/forestry/mail/proxy/ClientProxyMail.java b/src/main/java/forestry/mail/proxy/ClientProxyMail.java similarity index 92% rename from forestry_common/mail/forestry/mail/proxy/ClientProxyMail.java rename to src/main/java/forestry/mail/proxy/ClientProxyMail.java index 66ceaac83..b821899a9 100755 --- a/forestry_common/mail/forestry/mail/proxy/ClientProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ClientProxyMail.java @@ -17,7 +17,6 @@ import com.mojang.authlib.GameProfile; import forestry.core.network.ForestryPacket; import forestry.core.network.PacketIds; import forestry.core.proxy.Proxies; -import forestry.core.utils.Localization; import forestry.mail.POBox; import forestry.mail.POBoxInfo; import forestry.mail.PostRegistry; @@ -53,10 +52,4 @@ public class ClientProxyMail extends ProxyMail { GuiMailboxInfo.instance.setPOBoxInfo(info); } - - @Override - public void addLocalizations() { - Localization.instance.addLocalization("/lang/forestry/mail/"); - } - } diff --git a/forestry_common/mail/forestry/mail/proxy/ProxyMail.java b/src/main/java/forestry/mail/proxy/ProxyMail.java similarity index 97% rename from forestry_common/mail/forestry/mail/proxy/ProxyMail.java rename to src/main/java/forestry/mail/proxy/ProxyMail.java index e8b67864d..f693a6bbf 100755 --- a/forestry_common/mail/forestry/mail/proxy/ProxyMail.java +++ b/src/main/java/forestry/mail/proxy/ProxyMail.java @@ -38,8 +38,4 @@ public class ProxyMail { break; } } - - public void addLocalizations() { - } - } diff --git a/forestry_common/mail/forestry/mail/triggers/TriggerBuffer.java b/src/main/java/forestry/mail/triggers/TriggerBuffer.java similarity index 100% rename from forestry_common/mail/forestry/mail/triggers/TriggerBuffer.java rename to src/main/java/forestry/mail/triggers/TriggerBuffer.java diff --git a/forestry_common/mail/forestry/mail/triggers/TriggerHasMail.java b/src/main/java/forestry/mail/triggers/TriggerHasMail.java similarity index 100% rename from forestry_common/mail/forestry/mail/triggers/TriggerHasMail.java rename to src/main/java/forestry/mail/triggers/TriggerHasMail.java diff --git a/forestry_common/mail/forestry/mail/triggers/TriggerLowInput.java b/src/main/java/forestry/mail/triggers/TriggerLowInput.java similarity index 100% rename from forestry_common/mail/forestry/mail/triggers/TriggerLowInput.java rename to src/main/java/forestry/mail/triggers/TriggerLowInput.java diff --git a/forestry_common/mail/forestry/mail/triggers/TriggerLowPaper.java b/src/main/java/forestry/mail/triggers/TriggerLowPaper.java similarity index 100% rename from forestry_common/mail/forestry/mail/triggers/TriggerLowPaper.java rename to src/main/java/forestry/mail/triggers/TriggerLowPaper.java diff --git a/forestry_common/mail/forestry/mail/triggers/TriggerLowStamps.java b/src/main/java/forestry/mail/triggers/TriggerLowStamps.java similarity index 100% rename from forestry_common/mail/forestry/mail/triggers/TriggerLowStamps.java rename to src/main/java/forestry/mail/triggers/TriggerLowStamps.java diff --git a/pipes_common/forestry/pipes/EnumFilterType.java b/src/main/java/forestry/pipes/EnumFilterType.java similarity index 95% rename from pipes_common/forestry/pipes/EnumFilterType.java rename to src/main/java/forestry/pipes/EnumFilterType.java index 1b6bee5f7..677a4aca9 100755 --- a/pipes_common/forestry/pipes/EnumFilterType.java +++ b/src/main/java/forestry/pipes/EnumFilterType.java @@ -10,7 +10,7 @@ package forestry.pipes; import java.util.Locale; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.core.config.ForestryItem; @@ -32,7 +32,7 @@ public enum EnumFilterType { } @SideOnly(Side.CLIENT) - public Icon getIcon() { + public IIcon getIcon() { return TextureManager.getInstance().getDefault("analyzer/" + this.toString().toLowerCase(Locale.ENGLISH)); } } diff --git a/pipes_common/forestry/pipes/GuiHandlerPipes.java b/src/main/java/forestry/pipes/GuiHandlerPipes.java similarity index 95% rename from pipes_common/forestry/pipes/GuiHandlerPipes.java rename to src/main/java/forestry/pipes/GuiHandlerPipes.java index 9bf221fe2..59c30208f 100755 --- a/pipes_common/forestry/pipes/GuiHandlerPipes.java +++ b/src/main/java/forestry/pipes/GuiHandlerPipes.java @@ -21,7 +21,7 @@ import forestry.plugins.PluginApiculture; public class GuiHandlerPipes implements IGuiHandler { private Pipe getPipe(World world, int x, int y, int z) { - TileEntity tile = world.getBlockTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(x, y, z); if (tile == null) return null; @@ -54,7 +54,7 @@ public class GuiHandlerPipes implements IGuiHandler { switch (GuiId.values()[id]) { case PropolisPipeGUI: - PluginApiculture.beeInterface.getBreedingTracker(world, player.username).synchToPlayer(player); + PluginApiculture.beeInterface.getBreedingTracker(world, player.getGameProfile()).synchToPlayer(player); return new ContainerPropolisPipe(player.inventory, (PipeItemsPropolis)getPipe(world, x, y, z)); default: return null; diff --git a/pipes_common/forestry/pipes/PipeIconProvider.java b/src/main/java/forestry/pipes/PipeIconProvider.java similarity index 85% rename from pipes_common/forestry/pipes/PipeIconProvider.java rename to src/main/java/forestry/pipes/PipeIconProvider.java index f1679d0b4..bd5de5aac 100755 --- a/pipes_common/forestry/pipes/PipeIconProvider.java +++ b/src/main/java/forestry/pipes/PipeIconProvider.java @@ -7,8 +7,8 @@ ******************************************************************************/ package forestry.pipes; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; import buildcraft.api.core.IIconProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -16,18 +16,18 @@ import forestry.core.render.TextureManager; public class PipeIconProvider implements IIconProvider { - private static Icon[] icons; + private static IIcon[] icons; @Override @SideOnly(Side.CLIENT) - public Icon getIcon(int iconIndex) { + public IIcon getIcon(int iconIndex) { return icons[iconIndex]; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) { - icons = new Icon[7]; + public void registerIcons(IIconRegister iconRegister) { + icons = new IIcon[7]; icons[0] = TextureManager.getInstance().registerTex(iconRegister, "pipes/pipe_prop.empty"); icons[1] = TextureManager.getInstance().registerTex(iconRegister, "pipes/pipe_prop.black"); icons[2] = TextureManager.getInstance().registerTex(iconRegister, "pipes/pipe_prop.white"); diff --git a/src/main/java/forestry/pipes/PipeItemsPropolis.java b/src/main/java/forestry/pipes/PipeItemsPropolis.java new file mode 100755 index 000000000..f54985991 --- /dev/null +++ b/src/main/java/forestry/pipes/PipeItemsPropolis.java @@ -0,0 +1,156 @@ +/******************************************************************************* + * Copyright 2011-2014 by SirSengir + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/. + ******************************************************************************/ +package forestry.pipes; + +import java.util.ArrayList; +import java.util.LinkedList; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.core.IIconProvider; +import buildcraft.transport.BlockGenericPipe; +import buildcraft.transport.Pipe; +import buildcraft.transport.PipeTransportItems; +import buildcraft.transport.TransportConstants; +import buildcraft.transport.pipes.events.PipeEventItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IBee; +import forestry.api.core.ForestryAPI; +import forestry.api.genetics.IAllele; +import forestry.core.network.GuiId; +import forestry.core.proxy.Proxies; +import forestry.plugins.PluginApiculture; + +public class PipeItemsPropolis extends Pipe { + + public final PipeLogicPropolis pipeLogic; + + public PipeItemsPropolis(Item item) { + super(new PipeTransportItems(), item); + pipeLogic = new PipeLogicPropolis(this); + transport.allowBouncing = true; + } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + pipeLogic.readFromNBT(nbt); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + pipeLogic.writeToNBT(nbt); + } + IIconProvider provider; + + @SideOnly(Side.CLIENT) + @Override + public IIconProvider getIconProvider() { + if (provider == null) + provider = new PipeIconProvider(); + + return provider; + } + + @Override + public int getIconIndex(ForgeDirection direction) { + if (direction == ForgeDirection.UNKNOWN) + return 0; + + return direction.ordinal() + 1; + } + + @Override + public boolean blockActivated(EntityPlayer player) { + if (!Proxies.common.isSimulating(getWorld())) + return true; + + if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() != null) + if (Block.getBlockFromItem(player.getCurrentEquippedItem().getItem()) instanceof BlockGenericPipe) + return false; + + player.openGui(ForestryAPI.instance, GuiId.PropolisPipeGUI.ordinal(), player.worldObj, container.xCoord, container.yCoord, container.zCoord); + + return true; + } + + public void eventHandler(PipeEventItem.FindDest event) { + LinkedList filteredOrientations = new LinkedList(); + LinkedList typedOrientations = new LinkedList(); + LinkedList defaultOrientations = new LinkedList(); + + // We need a bee! + EnumFilterType type = EnumFilterType.getType(event.item.getItemStack()); + IBee bee = null; + + if (type != EnumFilterType.ITEM) + bee = PluginApiculture.beeInterface.getMember(event.item.getItemStack()); + + // Filtered outputs + for (ForgeDirection dir : event.destinations) { + + // Continue if this direction is closed. + if (pipeLogic.isClosed(dir)) + continue; + + if (pipeLogic.isIndiscriminate(dir)) { + defaultOrientations.add(dir); + continue; + } + + // We need to match the type for this orientation's filter + if (!pipeLogic.matchType(dir, type, bee)) + continue; + + // Passing the type filter is enough for non-bee items. + if (type == EnumFilterType.ITEM) { + filteredOrientations.add(dir); + continue; + } + + ArrayList filters = pipeLogic.getGenomeFilters(dir); + // If we have no genome filters, this is only a typed route. + if (filters.size() <= 0) { + typedOrientations.add(dir); + continue; + } + + // Bees need to match one of the genome filters + for (IAllele[] pattern : filters) { + if (pipeLogic.matchAllele(pattern[0], bee.getIdent()) && pipeLogic.matchAllele(pattern[1], bee.getGenome().getSecondary().getUID())) + filteredOrientations.add(dir); + } + } + + event.destinations.clear(); + + if (filteredOrientations.size() > 0) + event.destinations.addAll(filteredOrientations); + else if (typedOrientations.size() > 0) + event.destinations.addAll(typedOrientations); + else + event.destinations.addAll(defaultOrientations); + } + + public void eventHandler(PipeEventItem.Entered event) { + // A bit of speed to perhaps prevent bees from popping out of the pipe. + try { + event.item.setSpeed(TransportConstants.PIPE_NORMAL_SPEED * 20F); + } catch (Throwable error) { + } + } + + public void eventHandler(PipeEventItem.AdjustSpeed event) { + transport.defaultReajustSpeed(event.item); + } +} diff --git a/pipes_common/forestry/pipes/PipeLogicPropolis.java b/src/main/java/forestry/pipes/PipeLogicPropolis.java similarity index 99% rename from pipes_common/forestry/pipes/PipeLogicPropolis.java rename to src/main/java/forestry/pipes/PipeLogicPropolis.java index 460a24b6d..5808e0ca3 100755 --- a/pipes_common/forestry/pipes/PipeLogicPropolis.java +++ b/src/main/java/forestry/pipes/PipeLogicPropolis.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import buildcraft.transport.BlockGenericPipe; import buildcraft.transport.Pipe; import forestry.api.apiculture.EnumBeeChromosome; diff --git a/pipes_common/forestry/pipes/gui/ContainerPropolisPipe.java b/src/main/java/forestry/pipes/gui/ContainerPropolisPipe.java similarity index 100% rename from pipes_common/forestry/pipes/gui/ContainerPropolisPipe.java rename to src/main/java/forestry/pipes/gui/ContainerPropolisPipe.java diff --git a/pipes_common/forestry/pipes/gui/GuiPropolisPipe.java b/src/main/java/forestry/pipes/gui/GuiPropolisPipe.java similarity index 95% rename from pipes_common/forestry/pipes/gui/GuiPropolisPipe.java rename to src/main/java/forestry/pipes/gui/GuiPropolisPipe.java index c79ca7b69..0922fab32 100755 --- a/pipes_common/forestry/pipes/gui/GuiPropolisPipe.java +++ b/src/main/java/forestry/pipes/gui/GuiPropolisPipe.java @@ -12,8 +12,8 @@ import java.util.Locale; import java.util.Map.Entry; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.Icon; -import net.minecraftforge.common.ForgeDirection; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -63,7 +63,7 @@ public class GuiPropolisPipe extends GuiForestry { @Override public void draw(int startX, int startY) { EnumFilterType type = logic.getTypeFilter(orientation); - Icon icon = null; + IIcon icon = null; if (type != null) icon = type.getIcon(); if(icon == null) @@ -132,7 +132,7 @@ public class GuiPropolisPipe extends GuiForestry { for (int i = 0; i < 3; ++i) { - Icon icon = ((ItemBeeGE) ForestryItem.beeDroneGE.item()).getIconFromSpecies((IAlleleBeeSpecies) species, i); + IIcon icon = ((ItemBeeGE) ForestryItem.beeDroneGE.item()).getIconFromSpecies((IAlleleBeeSpecies) species, i); int color = ((ItemGE) ForestryItem.beeDroneGE.item()).getColourFromSpecies(species, i); float colorR = (color >> 16 & 255) / 255.0F; @@ -222,7 +222,7 @@ public class GuiPropolisPipe extends GuiForestry { for (int i = 0; i < 6; i++) widgetManager.add(new TypeFilterSlot(8, 18 + i * 18, ForgeDirection.values()[i], pipeLogic)); - IApiaristTracker tracker = PluginApiculture.beeInterface.getBreedingTracker(player.worldObj, player.username); + IApiaristTracker tracker = PluginApiculture.beeInterface.getBreedingTracker(player.worldObj, player.getGameProfile()); for (int i = 0; i < 6; i++) for (int j = 0; j < 3; j++) for (int k = 0; k < 2; k++) @@ -232,6 +232,6 @@ public class GuiPropolisPipe extends GuiForestry { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { super.drawGuiContainerForegroundLayer(mouseX, mouseY); - fontRenderer.drawString("Apiarist's Pipe", 56, 6, 0x303030); + fontRendererObj.drawString("Apiarist's Pipe", 56, 6, 0x303030); } } diff --git a/pipes_common/forestry/pipes/network/PacketHandlerPipes.java b/src/main/java/forestry/pipes/network/PacketHandlerPipes.java similarity index 88% rename from pipes_common/forestry/pipes/network/PacketHandlerPipes.java rename to src/main/java/forestry/pipes/network/PacketHandlerPipes.java index dd86d8e7b..d13b47e9f 100755 --- a/pipes_common/forestry/pipes/network/PacketHandlerPipes.java +++ b/src/main/java/forestry/pipes/network/PacketHandlerPipes.java @@ -11,12 +11,10 @@ import java.io.DataInputStream; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.network.INetworkManager; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import buildcraft.transport.Pipe; import buildcraft.transport.TileGenericPipe; -import cpw.mods.fml.common.network.Player; import forestry.core.interfaces.IPacketHandler; import forestry.core.network.PacketCoordinates; import forestry.core.network.PacketIds; @@ -30,7 +28,7 @@ import forestry.pipes.gui.ContainerPropolisPipe; public class PacketHandlerPipes implements IPacketHandler { private Pipe getPipe(World world, int x, int y, int z) { - TileEntity tile = world.getBlockTileEntity(x, y, z); + TileEntity tile = world.getTileEntity(x, y, z); if (tile == null) return null; @@ -41,14 +39,11 @@ public class PacketHandlerPipes implements IPacketHandler { } @Override - public void onPacketData(INetworkManager network, int packetID, DataInputStream data, Player player) { + public void onPacketData(int packetID, DataInputStream data, EntityPlayer player) { try { - PacketUpdate packetU; - switch (packetID) { - // CLIENT case PacketIds.PROP_SEND_FILTER_SET: PacketNBT packetN = new PacketNBT(); @@ -60,17 +55,17 @@ public class PacketHandlerPipes implements IPacketHandler { case PacketIds.PROP_REQUEST_FILTER_SET: PacketCoordinates packetC = new PacketCoordinates(); packetC.readData(data); - onRequestFilterSet((EntityPlayer) player, packetC); + onRequestFilterSet(player, packetC); break; case PacketIds.PROP_SEND_FILTER_CHANGE_TYPE: packetU = new PacketUpdate(); packetU.readData(data); - onTypeFilterChange((EntityPlayer) player, packetU); + onTypeFilterChange(player, packetU); break; case PacketIds.PROP_SEND_FILTER_CHANGE_GENOME: packetU = new PacketUpdate(); packetU.readData(data); - onGenomeFilterChange((EntityPlayer) player, packetU); + onGenomeFilterChange(player, packetU); break; } @@ -118,5 +113,4 @@ public class PacketHandlerPipes implements IPacketHandler { if (pipe instanceof PipeItemsPropolis) ((PipeItemsPropolis) pipe).pipeLogic.sendFilterSet(player); } - } diff --git a/pipes_common/forestry/pipes/proxy/ClientProxyPipes.java b/src/main/java/forestry/pipes/proxy/ClientProxyPipes.java similarity index 70% rename from pipes_common/forestry/pipes/proxy/ClientProxyPipes.java rename to src/main/java/forestry/pipes/proxy/ClientProxyPipes.java index ef8557afc..b2996274a 100755 --- a/pipes_common/forestry/pipes/proxy/ClientProxyPipes.java +++ b/src/main/java/forestry/pipes/proxy/ClientProxyPipes.java @@ -7,28 +7,22 @@ ******************************************************************************/ package forestry.pipes.proxy; +import net.minecraft.item.Item; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; -import buildcraft.core.utils.Localization; import buildcraft.transport.TransportProxyClient; import forestry.plugins.PluginPropolisPipe; public class ClientProxyPipes extends ProxyPipes { @Override - public void registerCustomItemRenderer(int itemID, IItemRenderer basemod) { - MinecraftForgeClient.registerItemRenderer(itemID, basemod); + public void registerCustomItemRenderer(Item item, IItemRenderer basemod) { + MinecraftForgeClient.registerItemRenderer(item, basemod); } @Override public void initPropolisPipe() { super.initPropolisPipe(); - registerCustomItemRenderer(PluginPropolisPipe.pipeItemsPropolis.itemID, TransportProxyClient.pipeItemRenderer); + registerCustomItemRenderer(PluginPropolisPipe.pipeItemsPropolis, TransportProxyClient.pipeItemRenderer); } - - @Override - public void addLocalizations() { - Localization.addLocalization("/lang/forestry/pipes/", "en_US"); - } - } diff --git a/src/main/java/forestry/pipes/proxy/ProxyPipes.java b/src/main/java/forestry/pipes/proxy/ProxyPipes.java new file mode 100755 index 000000000..89ca52d96 --- /dev/null +++ b/src/main/java/forestry/pipes/proxy/ProxyPipes.java @@ -0,0 +1,70 @@ +/******************************************************************************* + * Copyright 2011-2014 by SirSengir + * + * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License. + * + * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/. + ******************************************************************************/ +package forestry.pipes.proxy; + +import java.lang.reflect.Constructor; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import buildcraft.BuildCraftTransport; +import buildcraft.core.CreativeTabBuildCraft; +import buildcraft.transport.BlockGenericPipe; +import buildcraft.transport.ItemPipe; +import buildcraft.transport.Pipe; +import buildcraft.transport.TransportProxy; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.pipes.PipeItemsPropolis; +import forestry.plugins.PluginPropolisPipe; + +public class ProxyPipes { + + public void registerCustomItemRenderer(Item item, IItemRenderer basemod) { + } + + public void initPropolisPipe() { + PluginPropolisPipe.pipeItemsPropolis = createPipe(PipeItemsPropolis.class, CreativeTabBuildCraft.PIPES); + } + + public Item createPipe(Class clas, CreativeTabBuildCraft creativeTab) { + + return registerPipe(clas, creativeTab); + } + + /** + * Overriding the method in BlockGenericPipe to fix localizations. + */ + public static ItemPipe registerPipe(Class clas, CreativeTabBuildCraft creativeTab) { + ItemPipe item = null; + try { + Constructor ctor = ItemPipe.class.getDeclaredConstructor(CreativeTabBuildCraft.class); + ctor.setAccessible(true); + item = ctor.newInstance(creativeTab); + } catch(Exception e) { + e.printStackTrace(); + } + assert item != null : "The ItemPipe instance must not be null"; + item.setUnlocalizedName(clas.getSimpleName()); + GameRegistry.registerItem(item, item.getUnlocalizedName()); + + BlockGenericPipe.pipes.put(item, clas); + + Pipe dummyPipe = BlockGenericPipe.createPipe(item); + if (dummyPipe != null) { + item.setPipeIconIndex(dummyPipe.getIconIndexForItem()); + TransportProxy.proxy.setIconProviderFromPipe(item, dummyPipe); + } + + return item; + } + + public void registerCraftingPropolis(ItemStack resource) { + GameRegistry.addRecipe(new ItemStack(PluginPropolisPipe.pipeItemsPropolis), "#X#", '#', resource, 'X', BuildCraftTransport.pipeItemsDiamond); + + } +} diff --git a/forestry_common/core/forestry/plugins/NativePlugin.java b/src/main/java/forestry/plugins/NativePlugin.java similarity index 100% rename from forestry_common/core/forestry/plugins/NativePlugin.java rename to src/main/java/forestry/plugins/NativePlugin.java diff --git a/forestry_common/apiculture/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java similarity index 99% rename from forestry_common/apiculture/forestry/plugins/PluginApiculture.java rename to src/main/java/forestry/plugins/PluginApiculture.java index 82568a638..a19bec5d2 100755 --- a/forestry_common/apiculture/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -192,8 +192,6 @@ public class PluginApiculture extends NativePlugin { MinecraftForge.EVENT_BUS.register(this); - proxy.addLocalizations(); - createHiveDropArrays(); ForestryBlock.apiculture = new BlockBase(Material.iron); diff --git a/forestry_common/arboriculture/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java similarity index 99% rename from forestry_common/arboriculture/forestry/plugins/PluginArboriculture.java rename to src/main/java/forestry/plugins/PluginArboriculture.java index f61b69b7d..1b3dd4e4c 100755 --- a/forestry_common/arboriculture/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -319,8 +319,6 @@ public class PluginArboriculture extends NativePlugin implements IFuelHandler { public void doInit() { super.doInit(); - proxy.addLocalizations(); - GameRegistry.registerTileEntity(TileSapling.class, "forestry.Sapling"); GameRegistry.registerTileEntity(TileLeaves.class, "forestry.Leaves"); GameRegistry.registerTileEntity(TileStairs.class, "forestry.Stairs"); diff --git a/forestry_common/core/forestry/plugins/PluginBuildCraft.java b/src/main/java/forestry/plugins/PluginBuildCraft.java similarity index 96% rename from forestry_common/core/forestry/plugins/PluginBuildCraft.java rename to src/main/java/forestry/plugins/PluginBuildCraft.java index 6a4948260..8b638e8a0 100755 --- a/forestry_common/core/forestry/plugins/PluginBuildCraft.java +++ b/src/main/java/forestry/plugins/PluginBuildCraft.java @@ -43,7 +43,7 @@ import forestry.core.gadgets.TileForestry; import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; -@PluginInfo(pluginID = "BC3", name = "BuildCraft 3", author = "SirSengir", url = Defaults.URL, description = "Compatibility plugin for BuildCraft 3.") +@PluginInfo(pluginID = "BC6", name = "BuildCraft 6", author = "SirSengir", url = Defaults.URL, description = "Compatibility plugin for BuildCraft 6.") public class PluginBuildCraft implements IPlugin, ITriggerProvider { public static PluginBuildCraft instance; @@ -131,7 +131,7 @@ public class PluginBuildCraft implements IPlugin, ITriggerProvider { return; } - Proxies.common.addRecipe(new ItemStack(pipeWaterproof), new Object[] { "#", Character.valueOf('#'), ForestryItem.beeswax }); + Proxies.common.addRecipe(new ItemStack(pipeWaterproof), "#", '#', ForestryItem.beeswax); } public double invokeUseEnergyMethod(PowerHandler workProvider, float min, float max, boolean doUse) { diff --git a/forestry_common/core/forestry/plugins/PluginCore.java b/src/main/java/forestry/plugins/PluginCore.java similarity index 98% rename from forestry_common/core/forestry/plugins/PluginCore.java rename to src/main/java/forestry/plugins/PluginCore.java index 71b6aad7e..89e022fc3 100755 --- a/forestry_common/core/forestry/plugins/PluginCore.java +++ b/src/main/java/forestry/plugins/PluginCore.java @@ -27,6 +27,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.RecipeSorter; import forestry.api.circuits.ChipsetManager; import forestry.api.core.PluginInfo; @@ -108,9 +109,9 @@ public class PluginCore extends NativePlugin implements IFuelHandler { Proxies.common.registerBlock(ForestryBlock.core, ItemForestryBlock.class); definitionAnalyzer = ForestryBlock.core.addDefinition(new MachineDefinition(Defaults.DEFINITION_ANALYZER_META, "forestry.Analyzer", TileAnalyzer.class, - PluginApiculture.proxy.getRendererAnalyzer(Defaults.TEXTURE_PATH_BLOCKS + "/analyzer_"), new IRecipe[0])); + PluginApiculture.proxy.getRendererAnalyzer(Defaults.TEXTURE_PATH_BLOCKS + "/analyzer_"))); definitionEscritoire = ForestryBlock.core.addDefinition(new MachineDefinition(Defaults.DEFINITION_ESCRITOIRE_META, "forestry.Escritoire", TileEscritoire.class, - Proxies.render.getRenderEscritoire(), new IRecipe[0])); + Proxies.render.getRenderEscritoire())); ForestryBlock.soil = new BlockSoil().setBlockName("soil"); Proxies.common.registerBlock(ForestryBlock.soil, ItemForestryBlock.class); @@ -146,7 +147,9 @@ public class PluginCore extends NativePlugin implements IFuelHandler { definitionAnalyzer.register(); definitionEscritoire.register(); crashCallable = new ForestryModEnvWarningCallable(); - } + + RecipeSorter.register("forestry:shapedrecipecustom", ShapedRecipeCustom.class, RecipeSorter.Category.SHAPED, "before:minecraft:shaped"); + } @Override public boolean isAvailable() { @@ -231,11 +234,11 @@ public class PluginCore extends NativePlugin implements IFuelHandler { ForestryItem.circuitboards.registerItem(new ItemCircuitBoard(), "chipsets"); ForestryItem.solderingIron.registerItem(new ItemSolderingIron(), "solderingIron"); ForestryItem.tubes.registerItem(new ItemOverlay(CreativeTabForestry.tabForestry, - new OverlayInfo[] { new OverlayInfo("ex-0", 0xffffff, 0xe3b78e), new OverlayInfo("ex-1", 0xffffff, 0xe1eef4), + new OverlayInfo("ex-0", 0xffffff, 0xe3b78e), new OverlayInfo("ex-1", 0xffffff, 0xe1eef4), new OverlayInfo("ex-2", 0xffffff, 0xddc276), new OverlayInfo("ex-3", 0xffffff, 0xd8d8d8), new OverlayInfo("ex-4", 0xffffff, 0xffff8b), new OverlayInfo("ex-5", 0xffffff, 0x7bd1b8), new OverlayInfo("ex-6", 0xffffff, 0x866bc0), new OverlayInfo("ex-7", 0xfff87e, 0xd96600), new OverlayInfo("ex-8", 0xffffff, 0x444444), new OverlayInfo("ex-9", 0xffffff, 0xbfffdd), new OverlayInfo("ex-10", 0xffffff, 0x68ccee), - new OverlayInfo("ex-11", 0xffffff, 0x1c57c6) }), "thermionicTubes"); + new OverlayInfo("ex-11", 0xffffff, 0x1c57c6)), "thermionicTubes"); // / CRATES AND CARTONS ForestryItem.carton.registerItem((new ItemForestry()), "carton"); diff --git a/forestry_common/apiculture/forestry/plugins/PluginEE.java b/src/main/java/forestry/plugins/PluginEE.java similarity index 98% rename from forestry_common/apiculture/forestry/plugins/PluginEE.java rename to src/main/java/forestry/plugins/PluginEE.java index e3c9d3e0e..c1b4816f2 100755 --- a/forestry_common/apiculture/forestry/plugins/PluginEE.java +++ b/src/main/java/forestry/plugins/PluginEE.java @@ -80,7 +80,7 @@ public class PluginEE implements IPlugin { reddenedA = new MutationEMC(Allele.speciesDarkened, Allele.speciesTropical, BeeTemplates.getReddenedTemplate(), 100, eeBlock2, eeRelay3Class, eeRelay3EMCField, 466944); omegaA = new MutationEMC(Allele.speciesDarkened, Allele.speciesReddened, BeeTemplates.getOmegaTemplate(), 100, eeBlock2, eeRelay3Class, - eeRelay3EMCField, 933888).restrictBiomeType(BiomeDictionary.Type.NETHER).restrictBiomeType(BiomeDictionary.Type.DESERT); + eeRelay3EMCField, 933888).restrictBiomeType(BiomeDictionary.Type.NETHER).restrictBiomeType(BiomeDictionary.Type.SANDY); } diff --git a/forestry_common/energy/forestry/plugins/PluginEnergy.java b/src/main/java/forestry/plugins/PluginEnergy.java similarity index 100% rename from forestry_common/energy/forestry/plugins/PluginEnergy.java rename to src/main/java/forestry/plugins/PluginEnergy.java diff --git a/forestry_common/factory/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java similarity index 100% rename from forestry_common/factory/forestry/plugins/PluginFactory.java rename to src/main/java/forestry/plugins/PluginFactory.java diff --git a/forestry_common/farming/forestry/plugins/PluginFarmCraftory.java b/src/main/java/forestry/plugins/PluginFarmCraftory.java similarity index 100% rename from forestry_common/farming/forestry/plugins/PluginFarmCraftory.java rename to src/main/java/forestry/plugins/PluginFarmCraftory.java diff --git a/forestry_common/farming/forestry/plugins/PluginFarming.java b/src/main/java/forestry/plugins/PluginFarming.java similarity index 99% rename from forestry_common/farming/forestry/plugins/PluginFarming.java rename to src/main/java/forestry/plugins/PluginFarming.java index 3279cdefc..923a7166d 100755 --- a/forestry_common/farming/forestry/plugins/PluginFarming.java +++ b/src/main/java/forestry/plugins/PluginFarming.java @@ -165,8 +165,6 @@ public class PluginFarming extends NativePlugin { public void doInit() { super.doInit(); - proxy.addLocalizations(); - GameRegistry.registerTileEntity(TileFarmPlain.class, "forestry.Farm"); GameRegistry.registerTileEntity(TileGearbox.class, "forestry.FarmGearbox"); GameRegistry.registerTileEntity(TileHatch.class, "forestry.FarmHatch"); diff --git a/forestry_common/food/forestry/plugins/PluginFood.java b/src/main/java/forestry/plugins/PluginFood.java similarity index 100% rename from forestry_common/food/forestry/plugins/PluginFood.java rename to src/main/java/forestry/plugins/PluginFood.java diff --git a/forestry_common/core/forestry/plugins/PluginIC2.java b/src/main/java/forestry/plugins/PluginIC2.java similarity index 95% rename from forestry_common/core/forestry/plugins/PluginIC2.java rename to src/main/java/forestry/plugins/PluginIC2.java index 064684625..d79be6a5b 100755 --- a/forestry_common/core/forestry/plugins/PluginIC2.java +++ b/src/main/java/forestry/plugins/PluginIC2.java @@ -33,6 +33,8 @@ import forestry.core.proxy.Proxies; import forestry.core.utils.LiquidHelper; import forestry.core.utils.RecipeUtil; import forestry.core.utils.StackUtils; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.Recipes; @PluginInfo(pluginID = "IC2", name = "IndustrialCraft2", author = "SirSengir", url = Defaults.URL, description = "Compatibility plugin for IC2.") public class PluginIC2 implements IPlugin { @@ -80,8 +82,8 @@ public class PluginIC2 implements IPlugin { initFermentation(); initCrates(); - //Ic2Recipes.addRecyclerBlacklistItem(ForestryItem.beeQueenGE); - //Ic2Recipes.addRecyclerBlacklistItem(ForestryItem.beePrincessGE); + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beeQueenGE.getItemStack())); + Recipes.recyclerBlacklist.add(new RecipeInputItemStack(ForestryItem.beePrincessGE.getItemStack())); // Remove some items from the recycler registerBackpackItems(); @@ -123,9 +125,7 @@ public class PluginIC2 implements IPlugin { LiquidHelper.injectTinContainer(Defaults.LIQUID_WATER, Defaults.BUCKET_VOLUME, waterCell, emptyCell); if (GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can").stackSize > 0) Proxies.common - .addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), - new Object[] { "#Y#", "YXY", "#Y#", Character.valueOf('#'), Blocks.dirt, Character.valueOf('X'), waterCell, Character.valueOf('Y'), - Blocks.sand }); + .addRecipe(GameMode.getGameMode().getStackSetting("recipe.output.bogearth.can"), "#Y#", "YXY", "#Y#", '#', Blocks.dirt, 'X', waterCell, 'Y', Blocks.sand); } private void initRubberChain() { diff --git a/forestry_common/lepidopterology/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java similarity index 98% rename from forestry_common/lepidopterology/forestry/plugins/PluginLepidopterology.java rename to src/main/java/forestry/plugins/PluginLepidopterology.java index 1cc6abd14..997c811c1 100755 --- a/forestry_common/lepidopterology/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -17,6 +17,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraftforge.oredict.RecipeSorter; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.network.IGuiHandler; @@ -90,15 +91,13 @@ public class PluginLepidopterology extends NativePlugin { public void preInit() { super.preInit(); - proxy.addLocalizations(); - ForestryBlock.lepidopterology = new BlockBase(Material.iron); ForestryBlock.lepidopterology.setBlockName("for.lepidopterology").setCreativeTab(Tabs.tabLepidopterology); Proxies.common.registerBlock(ForestryBlock.lepidopterology, ItemForestryBlock.class); definitionChest = ForestryBlock.lepidopterology.addDefinition((new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, - ShapedRecipeCustom.createShapedRecipe(new ItemStack(ForestryBlock.lepidopterology, 1, Defaults.DEFINITION_LEPICHEST_META), new Object[] { " # ", "XYX", "XXX", Character.valueOf('#'), Blocks.glass, Character.valueOf('X'), - ForestryItem.butterflyGE.getItemStack(1, Defaults.WILDCARD), Character.valueOf('Y'), Blocks.chest })) + ShapedRecipeCustom.createShapedRecipe(new ItemStack(ForestryBlock.lepidopterology, 1, Defaults.DEFINITION_LEPICHEST_META), new Object[] { " # ", "XYX", "XXX", '#', Blocks.glass, 'X', + ForestryItem.butterflyGE.getItemStack(1, Defaults.WILDCARD), 'Y', Blocks.chest })) .setFaces(0, 1, 2, 3, 4, 4, 0, 7))); @@ -129,6 +128,8 @@ public class PluginLepidopterology extends NativePlugin { definitionChest.register(); ((ITreeRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootTrees")).registerLeafTickHandler(new ButterflySpawner()); + + RecipeSorter.register("forestry:lepidopterologymating", MatingRecipe.class, RecipeSorter.Category.SHAPELESS, "before:minecraft:shapeless"); } @Override diff --git a/forestry_common/mail/forestry/plugins/PluginMail.java b/src/main/java/forestry/plugins/PluginMail.java similarity index 99% rename from forestry_common/mail/forestry/plugins/PluginMail.java rename to src/main/java/forestry/plugins/PluginMail.java index 1419b3396..57c0af251 100755 --- a/forestry_common/mail/forestry/plugins/PluginMail.java +++ b/src/main/java/forestry/plugins/PluginMail.java @@ -134,8 +134,6 @@ public class PluginMail extends NativePlugin { public void doInit() { super.doInit(); - proxy.addLocalizations(); - definitionMailbox.register(); definitionTradestation.register(); definitionPhilatelist.register(); diff --git a/forestry_common/core/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java similarity index 97% rename from forestry_common/core/forestry/plugins/PluginManager.java rename to src/main/java/forestry/plugins/PluginManager.java index 01d731c1c..1d4228007 100755 --- a/forestry_common/core/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -134,15 +134,18 @@ public class PluginManager { String[] tokens = binpath.split("[\\\\/]"); String packageName = ""; + boolean inIdea = false; for (int i = 0; i < tokens.length; i++) { if (tokens[i] == null) break; - if (!tokens[i].equals("bin")) + if (tokens[i].equals("production")) + inIdea = true; + if (!tokens[i].equals("bin") && !inIdea) continue; // We are at bin, build the rest and return - for (int j = i + 1; j < tokens.length; j++) { + for (int j = (inIdea ? i + 2 : i + 1); j < tokens.length; j++) { if (packageName.length() > 0) packageName += "."; packageName += tokens[j]; diff --git a/forestry_common/farming/forestry/plugins/PluginNatura.java b/src/main/java/forestry/plugins/PluginNatura.java similarity index 100% rename from forestry_common/farming/forestry/plugins/PluginNatura.java rename to src/main/java/forestry/plugins/PluginNatura.java diff --git a/pipes_common/forestry/plugins/PluginPropolisPipe.java b/src/main/java/forestry/plugins/PluginPropolisPipe.java similarity index 83% rename from pipes_common/forestry/plugins/PluginPropolisPipe.java rename to src/main/java/forestry/plugins/PluginPropolisPipe.java index ed3c759f9..f90d87cba 100755 --- a/pipes_common/forestry/plugins/PluginPropolisPipe.java +++ b/src/main/java/forestry/plugins/PluginPropolisPipe.java @@ -21,7 +21,7 @@ import forestry.pipes.GuiHandlerPipes; import forestry.pipes.network.PacketHandlerPipes; import forestry.pipes.proxy.ProxyPipes; -@PluginInfo(pluginID = "Pipes", name = "Pipes", author = "SirSengir", url = Defaults.URL, description = "Adds the apiarist's pipe for beekeeping if apiculture is enabled and BuildCraft 3 is present.") +@PluginInfo(pluginID = "Pipes", name = "Pipes", author = "SirSengir", url = Defaults.URL, description = "Adds the apiarist's pipe for beekeeping if apiculture is enabled and BuildCraft 6 is present.") public class PluginPropolisPipe extends NativePlugin { public static ProxyPipes proxy; @@ -44,11 +44,11 @@ public class PluginPropolisPipe extends NativePlugin { @Override public void preInit() { - config = new Configuration(); + /*config = new Configuration(); propolisPipeItemId = Integer.parseInt(PluginPropolisPipe.config.get("propolisPipe", CONFIG_CATEGORY, 14000).Value); - config.save(); + config.save();*/ } @@ -58,19 +58,17 @@ public class PluginPropolisPipe extends NativePlugin { @Override public void postInit() { - String proxyClass = "forestry.pipes.proxy.ProxyPipes"; - if (FMLCommonHandler.instance().getSide().isClient()) - proxyClass = "forestry.pipes.proxy.ClientProxyPipes"; + String proxyClass = "forestry.pipes.proxy.ProxyPipes"; + if (FMLCommonHandler.instance().getSide().isClient()) + proxyClass = "forestry.pipes.proxy.ClientProxyPipes"; - proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", proxyClass); + proxy = (ProxyPipes) Proxies.common.instantiateIfModLoaded("BuildCraft|Transport", proxyClass); - if (proxy == null) - return; + if (proxy == null) + return; proxy.initPropolisPipe(); proxy.registerCraftingPropolis(ForestryItem.propolis.getItemStack()); - proxy.addLocalizations(); - } @Override diff --git a/forestry_common/storage/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java similarity index 100% rename from forestry_common/storage/forestry/plugins/PluginStorage.java rename to src/main/java/forestry/plugins/PluginStorage.java diff --git a/forestry_common/storage/forestry/storage/BackpackDefinition.java b/src/main/java/forestry/storage/BackpackDefinition.java similarity index 100% rename from forestry_common/storage/forestry/storage/BackpackDefinition.java rename to src/main/java/forestry/storage/BackpackDefinition.java diff --git a/forestry_common/storage/forestry/storage/BackpackHelper.java b/src/main/java/forestry/storage/BackpackHelper.java similarity index 100% rename from forestry_common/storage/forestry/storage/BackpackHelper.java rename to src/main/java/forestry/storage/BackpackHelper.java diff --git a/forestry_common/storage/forestry/storage/BackpackMode.java b/src/main/java/forestry/storage/BackpackMode.java similarity index 100% rename from forestry_common/storage/forestry/storage/BackpackMode.java rename to src/main/java/forestry/storage/BackpackMode.java diff --git a/forestry_common/storage/forestry/storage/GuiHandlerStorage.java b/src/main/java/forestry/storage/GuiHandlerStorage.java similarity index 100% rename from forestry_common/storage/forestry/storage/GuiHandlerStorage.java rename to src/main/java/forestry/storage/GuiHandlerStorage.java diff --git a/forestry_common/storage/forestry/storage/PickupHandlerStorage.java b/src/main/java/forestry/storage/PickupHandlerStorage.java similarity index 100% rename from forestry_common/storage/forestry/storage/PickupHandlerStorage.java rename to src/main/java/forestry/storage/PickupHandlerStorage.java diff --git a/forestry_common/storage/forestry/storage/ResupplyHandler.java b/src/main/java/forestry/storage/ResupplyHandler.java similarity index 100% rename from forestry_common/storage/forestry/storage/ResupplyHandler.java rename to src/main/java/forestry/storage/ResupplyHandler.java diff --git a/forestry_common/storage/forestry/storage/gui/ContainerBackpack.java b/src/main/java/forestry/storage/gui/ContainerBackpack.java similarity index 100% rename from forestry_common/storage/forestry/storage/gui/ContainerBackpack.java rename to src/main/java/forestry/storage/gui/ContainerBackpack.java diff --git a/forestry_common/storage/forestry/storage/gui/ContainerNaturalistBackpack.java b/src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java similarity index 100% rename from forestry_common/storage/forestry/storage/gui/ContainerNaturalistBackpack.java rename to src/main/java/forestry/storage/gui/ContainerNaturalistBackpack.java diff --git a/forestry_common/storage/forestry/storage/gui/GuiBackpack.java b/src/main/java/forestry/storage/gui/GuiBackpack.java similarity index 100% rename from forestry_common/storage/forestry/storage/gui/GuiBackpack.java rename to src/main/java/forestry/storage/gui/GuiBackpack.java diff --git a/forestry_common/storage/forestry/storage/gui/GuiBackpackT2.java b/src/main/java/forestry/storage/gui/GuiBackpackT2.java similarity index 100% rename from forestry_common/storage/forestry/storage/gui/GuiBackpackT2.java rename to src/main/java/forestry/storage/gui/GuiBackpackT2.java diff --git a/forestry_common/storage/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java similarity index 100% rename from forestry_common/storage/forestry/storage/items/ItemBackpack.java rename to src/main/java/forestry/storage/items/ItemBackpack.java diff --git a/forestry_common/storage/forestry/storage/items/ItemNaturalistBackpack.java b/src/main/java/forestry/storage/items/ItemNaturalistBackpack.java similarity index 100% rename from forestry_common/storage/forestry/storage/items/ItemNaturalistBackpack.java rename to src/main/java/forestry/storage/items/ItemNaturalistBackpack.java diff --git a/forestry_resources/CREDITS.txt b/src/main/resources/CREDITS.txt similarity index 100% rename from forestry_resources/CREDITS.txt rename to src/main/resources/CREDITS.txt diff --git a/forestry_resources/lang/forestry/core/en_US.properties b/src/main/resources/assets/forestry/lang/en_US.lang old mode 100755 new mode 100644 similarity index 56% rename from forestry_resources/lang/forestry/core/en_US.properties rename to src/main/resources/assets/forestry/lang/en_US.lang index 37fad6af1..b5773b4b6 --- a/forestry_resources/lang/forestry/core/en_US.properties +++ b/src/main/resources/assets/forestry/lang/en_US.lang @@ -1,4 +1,6 @@ -# Master language file +#################### +# CORE +#################### yes=Yes no=No @@ -160,7 +162,6 @@ gui.maxspeed=Maximum gui.fastest=Fastest gui.faster=Faster gui.fast=Fast -gui.normal=Normal gui.slow=Slow gui.slower=Slower gui.slowest=Slowest @@ -228,7 +229,6 @@ gui.crop=Crop gui.lowest=Lowest gui.lower=Lower gui.low=Low -gui.normal=Normal gui.triple=Triple gui.high=High gui.higher=Higher @@ -538,3 +538,350 @@ trigger.lowInput=Input trigger.lowStamps=Stamps trigger.mailBuffer=Buffer usage.engine.tin=In Electrical Engines + +#################### +# APICULTURE +#################### + +apiculture.effect.aggressive=Aggress. +apiculture.effect.beatific=Beatific +apiculture.effect.creeper=Creeper +apiculture.effect.exploration=Explorer +apiculture.effect.glacial=Freezing +apiculture.effect.heroic=Heroic +apiculture.effect.ignition=Flammable +apiculture.effect.misasmic=Poison +apiculture.effect.misanthrope=Ends +apiculture.effect.radioactive=Radioact. +apiculture.effect.drunkard=Drunkard +apiculture.effect.snowing=Snow +apiculture.effect.resurrection=Resurrection +apiculture.effect.reanimation=Reanimation +apiculture.effect.repulsion=Repulsion +bees.hybrid.adj.add= +bees.hyphen.adj.add= +bees.drone=Drone +bees.drone.adj.add= +bees.larvae=Larvae +bees.larvae.adj.add= +bees.princess=Princess +bees.princess.adj.add= +bees.queen=Queen +bees.queen.adj.add= +bees.stock.pristine=Pristine Stock +bees.stock.ignoble=Ignoble Stock +death.bee.end=%1$s was ended by an unfriendly sting. +death.bee.end.player=%1$s was ended by an unfriendly sting while fighting %2$s. +death.bee.radioactive=%1$s walked into Chernobyl without his helmet on. +death.bee.radioactive.player=%1$s walked into Chernobyl without his helmet on. %2$s watched and cackled. +death.bee.aggressive=%1$s encountered a swarm of bees. That had to sting. +death.bee.aggressive.player=%1$s encountered a swarm of bees. %2$s stole his apiarist's suit. +genus.bees.common=Common +genus.bees.noble=Noble +genus.bees.industrious=Industrious +genus.bees.heroic=Heroic +genus.bees.infernal=Infernal +genus.bees.austere=Austere +genus.bees.end=End +genus.bees.vengeful=Vengeful +genus.bees.tropical=Tropical +genus.bees.frozen=Frozen +genus.bees.reddened=Reddened +genus.bees.festive=Festive +genus.bees.agrarian=Agrarian +genus.bees.boggy=Boggy +genus.bees.monastic=Monastic +bees.species.forest=Forest +bees.species.meadows=Meadows +bees.species.common=Common +bees.species.cultivated=Cultivated +bees.species.noble=Noble +bees.species.majestic=Majestic +bees.species.imperial=Imperial +bees.species.diligent=Diligent +bees.species.unweary=Unweary +bees.species.industrious=Industrious +bees.species.steadfast=Steadfast +bees.species.valiant=Valiant +bees.species.heroic=Heroic +bees.species.sinister=Sinister +bees.species.fiendish=Fiendish +bees.species.demonic=Demonic +bees.species.modest=Modest +bees.species.frugal=Frugal +bees.species.austere=Austere +bees.species.tropical=Tropical +bees.species.exotic=Exotic +bees.species.edenic=Edenic +bees.species.ender=Ender +bees.species.wintry=Wintry +bees.species.icy=Icy +bees.species.glacial=Glacial +bees.species.vindictive=Vindictive +bees.species.vengeful=Vengeful +bees.species.avenging=Avenging +bees.species.darkened=Darkened +bees.species.reddened=Reddened +bees.species.omega=Omega +bees.species.leporine=Leporine +bees.species.tricky=Tricky +bees.species.rural=Rural +bees.species.marshy=Marshy +bees.species.merry=Merry +bees.species.tipsy=Tipsy +bees.species.monastic=Monastic +bees.species.secluded=Secluded +bees.species.hermitic=Hermitic +bees.species.spectral=Spectral +bees.species.phantasmal=Phantasmal +beemode.easy.desc=Simplifies beebreeding by drastically increasing mutation rate and removing the chance for genetic fatigue. +beemode.normal.desc=Recommended mode for the normal player. +beemode.hard.desc=Reducing mutation rate slightly while increasing lifespan of individual queens by 50 %. +beemode.hardcore.desc=Halves mutation rate, increases lifespan of individual queens by 500 % and reduces fertility by 20 %. +beemode.insane.desc=Cuts mutation rate to 20 %, increases lifespan tenfold and reduces fertility by 40 %. +description.speciesForest=One of the most common pests in forests; Mostly docile.|Beekeeping 101 +description.speciesMeadows=Infests mostly plains in temperate climates; Mostly docile.|Beekeeping 101 +description.speciesCommon=Considered the beginner apiarist's badge of participation.|Beekeeping 101 +description.speciesCultivated=Fast working bee; Thinks anything but opera is beneath it.|Beekeeping 101 +description.speciesNoble="There is no more noble occupation in the world than to breed another bee."|Binnie, Apiarist +description.speciesMajestic="Off with their heads!"|Queen of Hearts +description.speciesImperial=Highly sought after bee; Specialises in the production of precious royal jelly.|Beekeeping 101 +description.speciesDiligent=Mostly noted as a stepping stone for the industrious line of bees.|Beekeeping 101 +description.speciesUnweary=Unweary. Then they die.|Beekeeping 101 +description.speciesIndustrious=Highly sought after bee; Specialises in the production of exquisite pollen.|Beekeeping 101 +description.speciesSteadfast=Considered extinct until some were found by adventurers in a deep dungeon.|Apiarist's Grimoire +description.speciesValiant=A rare subspecies rarely seen cohabiting in mundane hives.|Apiarist's Grimoire +description.speciesHeroic=Elaborate legends have surrounded this species. Will defend its hive to its death against any hostiles.|Apiarist's Grimoire +description.speciesSinister=Not many bee species are able to survive in the nether. And even those are severly affected by their hellish environment.|Beekeeping 101 +description.speciesFiendish=Experienced nether apiarist's have been reporting severe attacks by their bees. Caution is advised.|Beekeeping 101 +description.speciesDemonic=Born in the fires of the nether and being a descendant of generations of nether bees has caused this species to turn into a true demon.|Beekeeping 101 +description.speciesModest=Hot and arid climates have forced this species to adapt to a degree which will not allow it to survive in significantly friendlier climates.|Beekeeping 101 +description.speciesFrugal=Generations of bees baked in the sun to produce this species.|Beekeeping 101 +description.speciesAustere=Dangerous and volatile; Beekeepers are advised to stay in full suit whenever near.|Beekeeping 101 +description.speciesTropical="My travels along the jungle river allowed me to catch many of these poisonous specimen. Unfortunately I had lost my only austere branch to crocodiles a while back."|Beekeeping 101 +description.speciesExotic="The fever shook me and my apiarist's suit was drenched with cold sweat, but with trembling hands I finally managed to pull one of these from my apiary."|Beekeeping 101 +description.speciesEdenic="I furiously scribbled in my notebook, drawing sketches of the images I felt seeping into my brain while I was watching the insects perform their strange little dance."|Beekeeping 101 +description.speciesWintry=Common, but winter-hardened bee tribe; Cultivation in warmer climates is a challenge.|Beekeeping 101 +description.speciesIcy=Temperatures inside hives inhabited by this species will drop until ice shards form.|Beekeeping 101 +description.speciesGlacial="Winter is coming!"|E. Stark, beekeeper +description.speciesVindictive="It ate my face! It ate my face!"|K.M. +description.speciesVengeful="Veni, vidi, vici!"|Apinus Julius Caesar +description.speciesAvenging="The walls of my house began to crumble and I heard the roof creaking over my head, but I cared not! I felt the stabs of a thousand little insects on my glove as I grabbed the new queen."|Anonymous +description.speciesDarkened=Attracted by the power of alchemically bound matter, this species was a powerful source of energy.|Beekeeper's Lexicon +description.speciesReddened=Requiring massive amounts of alchemically bound matter, these little fellows could flood a world in energy.|Beekeeper's Lexicon +description.speciesOmega="I am Alpha and Omega, the beginning and the end, the first and the last."|Pahimar, beekeeper +description.speciesLeporine="I swear! It was tiny, had wings and I definitely saw fluffy little rabbit ears! ... No! I am not drunk!"|"Sir" Sengir, madman +description.speciesMerry="Hohoho!"|Merry bee +description.speciesTipsy="Dance my pretties! Dance!"|Tipsy Witch of the East +description.speciesTricky="Trick or Tricky Treat!"|Tricky Bee +description.speciesRural="Rain in May promises much hay."|M. Ages, Rural Beekeeper +description.speciesMarshy="Seriously? Mushrooms? Get out of here!"|Beekeeping 101 +description.speciesMonastic="I remained austere and said to him: 'Not only a princess, but also a whole pile of emeralds for a measly drone? That's extortion!'|Beekeeping 101 +description.speciesSecluded="Crossbreeding with the desert kind was a mistake. My bees withdrew more and more from the outside world."|Beekeeping 101 +description.speciesHermitic="My dear colleague! I noticed the bees you sent me refuse to wash and are growing full beards. Care to explain?"|Binnie, Apiarist +description.speciesEnded="I found one of these seemingly hermitical insects in a villager's apiary. It was torpid, obviously ripped from its world and longing for a fragment from it."|Beekeeping 101 +description.speciesSpectral="I was unsure whether it was alive as it lay there in the palm of my hand, glimmering and pulsating, oozing a coldness I never felt before. Then I heard the pile of bones behind me rattle..."|Beekeeping 101 +description.speciesPhantasmal="Whatever you do, do not, I repeat, DO NOT drop the dragon e..."|"Sir" Sengir, Last Words +tile.alveary.0=Alveary +tile.alveary.2=Swarmer +tile.alveary.3=Alveary Fan +tile.alveary.4=Alveary Heater +tile.alveary.5=Alveary Hygroregulator +tile.alveary.6=Alveary Stabiliser +tile.alveary.7=Alveary Sieve +tile.beehives.1=Forest Hive +tile.beehives.2=Meadows Hive +tile.beehives.3=Modest Hive +tile.beehives.4=Tropical Hive +tile.beehives.5=Ender Hive +tile.beehives.6=Wintry Hive +tile.beehives.7=Marshy Hive +tile.candle.stump=Unlit Candle +tile.candle.dyed.stump=Unlit Dyed Candle +tile.candle.lit=Lit Candle +tile.candle.dyed.lit=Lit Dyed Candle +tile.stump.0=Candle Stump +tile.for.apiculture.0=Apiary +tile.for.apiculture.1=Apiarist's Chest +tile.for.apiculture.2=Bee House + +#################### +# ARBORICULTURE +#################### + +gui.maturity=Matures +gui.treealyzer=Treealyzer +gui.treealyzer.help=Supply sapling and provide honey or honeydew as catalyst. +gui.treealyzer.overview=Analytics available +gui.saplings=Saplings +gui.yield=Yield +gui.sappiness=Sappiness +gui.height=Height +gui.fruits=Fruits +gui.supports=Supports +gui.family=Family +gui.girth=Girth +gui.native=Soil +gui.tolerated=Tolerates +gui.growth=Growth +description.treeOak=Common tree species whose apple-bearing properties are the subject of much song and dance.|Codex Lignum +description.treeBirch=Widespread birch tree, which on average is of smaller height.|Codex Lignum +description.treeLime=Tall, deciduous tree. It has been reclassified recently as being in the Malvaceae family.|Codex Lignum +description.treeWalnut=Tall, deciduous tree with large trunk. Naturally occuring walnut trees carry fruits which require some time to ripe.|Codex Lignum +description.treeChestnut=Tall, deciduous tree with large trunk. Naturally occuring chestnut trees carry fruits which require some time to ripe.|Codex Lignum +description.treeSipiri=Tall, evergreen trees with valuable timber. Wood and bark are pleasantly scented. Will only thrive in tropical climes.|Codex Lignum +description.treeWillow=Large, deciduous tree. White willows are fast-growing. Have only been observed to occur in damp climates.|Codex Lignum +description.treeCherry=Small tree. In its natural form it will bear cherries which will need to undergo a ripening period.|Codex Lignum +family.pomes=Pomes +family.prunes=Prunes +family.nuts=Nuts +family.jungle=Jungle +fruits.apple=Apple +fruits.cherry=Cherry +fruits.chestnut=Chestnut +fruits.walnut=Walnut +fruits.cocoa=Cocoa +fruits.none=None +fruits.plum=Plum +fruits.lemon=Lemon +fruits.dates=Dates +fruits.papaya=Papaya +item.grafter=Grafter +item.grafterProven=Proven Grafter +tile.log=Wood +tile.planks=Wood Planks +tile.slab=Wood Slab +tile.fences=Fence +tile.for.stairs=Stairs +wood.0=Larch +wood.1=Teak +wood.2=Acacia +wood.3=Lime +wood.4=Chestnut +wood.5=Wenge +wood.6=Baobab +wood.7=Sequoia +wood.8=Kapok +wood.9=Ebony +wood.10=Mahogany +wood.11=Balsa +wood.12=Willow +wood.13=Walnut +wood.14=Greenheart +wood.15=Cherry +wood.16=Mahoe +wood.17=Poplar +wood.18=Palm +wood.19=Papaya +wood.20=Pine +wood.21=Plum +wood.22=Maple +wood.23=Citrus +tile.for.arboriculture.0=Arborist's Chest + +#################### +# FARMING +#################### + +circuit.managedArboreal=Arboretum +circuit.managedPeat=Peat Bog +circuit.managedCereal=Crop Farm +circuit.managedVegetable=Vegetable Farm +circuit.managedInfernal=Infernal Farm +circuit.managedShroom=Shroom Farm +circuit.manualOrchard=Orchard +circuit.manualPeat=Peat Bog +circuit.manualCereal=Crop Farm +circuit.manualVegetable=Vegetable Farm +circuit.manualSucculent=Succulent Farm +circuit.manualPoales=Reed Farm +circuit.manualRubber=Rubber Plantation +circuit.manualGourd=Gourd Farm +circuit.manualCocoa=Cocoa Plantation +circuit.manualShroom=Shroom Farm +errors.noFertilizer.desc=No Fertilizer +errors.noFertilizer.help=Farms require fertilizer for function. Compost is insufficient. +errors.noFarmland.desc=No Farmland +errors.noFarmland.help=Smooth sandstone, bricks or stone bricks create a platform the farm will build on. +errors.noLiquid.desc=No Water +errors.noLiquid.help=Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water. +gui.hydration=Hydration Required +gui.hydr.heat=By Heat +gui.hydr.humid=By Humidity +gui.hydr.rainfall=By Rainfall +gui.hydr.overall=Overall +hints.farmland.tag=Lay out your farmland! +hints.farmland.desc=Smooth sandstone, bricks or stone bricks create a platform the farm will build on. +hints.gearbox.tag=Supply power! +hints.gearbox.desc=Use gearboxes to attach engines or power lines to your farm. +hints.valve.tag=Supply water! +hints.valve.desc=Almost all farms require water. Use valve blocks for automation. +hints.fertilizer.tag=Fertilizer needed! +hints.fertilizer.desc=All farms need fertilizer to work. Compost or mulch will not suffice. +hints.hatch.tag=Batten down the hatches! +hints.hatch.desc=Hatches are a pipe or tube's best friend. Use them to automate transport. +hints.circuitboard.tag=Program your farms! +hints.circuitboard.desc=Use a soldering iron to turn your tree farm into any kind of farm you like. +hints.manualfarms.tag=Manual farms! +hints.manualfarms.desc=Apart from the managed farms there are manual farms which will only maintain the farm, but not build it. +hints.farmgui.tag=Soil goes left, seeds go right! +hints.farmgui.desc=Soil goes into the left slots, seeds or saplings into the right slots of the reservoir on the top right part. +layout.farms.managed=Managed Farms +layout.farms.manual=Manual Farms +tile.ffarm.0=Farm Block +tile.ffarm.2=Farm Gearbox +tile.ffarm.3=Farm Hatch +tile.ffarm.4=Farm Valve +tile.ffarm.5=Farm Control +trigger.lowSoil=Soil +trigger.lowLiquid=Water Tank +trigger.lowFertilizer=Fertilizer +usage.farms.managed=Managed Farm +usage.farms.manual=Manual Farm + +#################### +# LEPIDOPTEROLOGY +#################### + +gui.flutterlyzer.help=Supply butterfly and provide honey or honeydew as a pacifier. +gui.loot.butterfly=Possible Butterfly Loot +gui.loot.caterpillar=Possible Caterpillar Loot +item.butterfly=Butterfly +item.moth=Moth +item.flutterlyzer=Flutterlyzer +storage.backpack.lepidopterist=Lepidopterist's Backpack +tile.for.lepidopterology.0=Lepidopterist's Chest + +#################### +# MAIL +#################### + +chat.mail.no_mailbox=Recipient has no mailbox. +chat.mail.not_mailable=Letter is not sendable. +chat.mail.not_postpaid=Letter is not sufficiently stamped. +chat.mail.mailbox_full=Recipient's mailbox is full. +chat.mail.already_mailed=Cannot resend letter. +chat.mail.response_not_mailable=Trade station cannot send the response letter. You need to have a mailbox to deliver to. +chat.mail.insufficient_offer=Trade station demands more. +chat.mail.insufficient_trade_good=Trade station has run out of supplies. +chat.mail.insufficient_buffer=Trade station is full. +chat.mail.insufficient_paper=Trade station ran out of paper. +chat.mail.insufficient_stamps=Trade station ran out of stamps. +chat.mail.ok=Trade is available. +chat.mail.wrongstacksize=Can only write one letter at a time. +gui.mail.catalogue.close=Close +gui.mail.catalogue.trade=Trade +gui.mail.filter.all=All +gui.mail.filter.online=Online +gui.mail.filter.offline=Offline +gui.mail.willtrade=%s will trade +gui.mail.address.copy=Use +gui.mail.tradefor=for +gui.mail.notrades=No trades available. +item.catalogue=Catalogue + +#################### +# PIPES +#################### + +item.PipeItemsPropolis.name=Apiarist's Pipe \ No newline at end of file diff --git a/forestry_resources/assets/forestry/logo.png b/src/main/resources/assets/forestry/logo.png similarity index 100% rename from forestry_resources/assets/forestry/logo.png rename to src/main/resources/assets/forestry/logo.png diff --git a/forestry_resources/assets/forestry/textures/blocks/analyzer.0.png b/src/main/resources/assets/forestry/textures/blocks/analyzer.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/analyzer.0.png rename to src/main/resources/assets/forestry/textures/blocks/analyzer.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/analyzer_pedestal.png b/src/main/resources/assets/forestry/textures/blocks/analyzer_pedestal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/analyzer_pedestal.png rename to src/main/resources/assets/forestry/textures/blocks/analyzer_pedestal.png diff --git a/forestry_resources/assets/forestry/textures/blocks/analyzer_tower1.png b/src/main/resources/assets/forestry/textures/blocks/analyzer_tower1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/analyzer_tower1.png rename to src/main/resources/assets/forestry/textures/blocks/analyzer_tower1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/analyzer_tower2.png b/src/main/resources/assets/forestry/textures/blocks/analyzer_tower2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/analyzer_tower2.png rename to src/main/resources/assets/forestry/textures/blocks/analyzer_tower2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiaristchest.0.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiaristchest.0.png rename to src/main/resources/assets/forestry/textures/blocks/apiaristchest.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiaristchest.1.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiaristchest.1.png rename to src/main/resources/assets/forestry/textures/blocks/apiaristchest.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiaristchest.2.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiaristchest.2.png rename to src/main/resources/assets/forestry/textures/blocks/apiaristchest.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiaristchest.3.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiaristchest.3.png rename to src/main/resources/assets/forestry/textures/blocks/apiaristchest.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiaristchest.4.png b/src/main/resources/assets/forestry/textures/blocks/apiaristchest.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiaristchest.4.png rename to src/main/resources/assets/forestry/textures/blocks/apiaristchest.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiary.0.png b/src/main/resources/assets/forestry/textures/blocks/apiary.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiary.0.png rename to src/main/resources/assets/forestry/textures/blocks/apiary.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiary.1.png b/src/main/resources/assets/forestry/textures/blocks/apiary.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiary.1.png rename to src/main/resources/assets/forestry/textures/blocks/apiary.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiary.2.png b/src/main/resources/assets/forestry/textures/blocks/apiary.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiary.2.png rename to src/main/resources/assets/forestry/textures/blocks/apiary.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiary.4.png b/src/main/resources/assets/forestry/textures/blocks/apiary.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiary.4.png rename to src/main/resources/assets/forestry/textures/blocks/apiary.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiary.7.png b/src/main/resources/assets/forestry/textures/blocks/apiary.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiary.7.png rename to src/main/resources/assets/forestry/textures/blocks/apiary.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.bottom.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.bottom.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.bottom.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.bottom.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.entrance.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.entrance.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.entrance.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.entrance.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.fan.off.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.fan.off.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.fan.off.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.fan.off.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.fan.on.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.fan.on.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.fan.on.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.fan.on.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.heater.off.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.heater.off.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.heater.off.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.heater.off.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.heater.on.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.heater.on.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.heater.on.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.heater.on.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.left.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.left.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.left.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.left.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.plain.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.plain.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.right.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.right.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.right.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.right.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.sieve.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.sieve.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.sieve.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.sieve.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.stabiliser.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.stabiliser.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.stabiliser.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.stabiliser.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.off.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.off.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.off.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.off.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.on.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.on.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.on.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.swarmer.on.png diff --git a/forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.valve.png b/src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.valve.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/apiculture/alveary.valve.png rename to src/main/resources/assets/forestry/textures/blocks/apiculture/alveary.valve.png diff --git a/forestry_resources/assets/forestry/textures/blocks/arbchest.0.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/arbchest.0.png rename to src/main/resources/assets/forestry/textures/blocks/arbchest.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/arbchest.1.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/arbchest.1.png rename to src/main/resources/assets/forestry/textures/blocks/arbchest.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/arbchest.2.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/arbchest.2.png rename to src/main/resources/assets/forestry/textures/blocks/arbchest.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/arbchest.3.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/arbchest.3.png rename to src/main/resources/assets/forestry/textures/blocks/arbchest.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/arbchest.4.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/arbchest.4.png rename to src/main/resources/assets/forestry/textures/blocks/arbchest.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/arbchest.7.png b/src/main/resources/assets/forestry/textures/blocks/arbchest.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/arbchest.7.png rename to src/main/resources/assets/forestry/textures/blocks/arbchest.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.1.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.1.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.1.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.1.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.1.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.2.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.2.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.2.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.2.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.2.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.3.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.3.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.3.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.3.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.3.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.4.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.4.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.4.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.4.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.4.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.5.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.5.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.5.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.5.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.5.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.6.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.6.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.6.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.6.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.6.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.7.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.7.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.7.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.7.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.7.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.8.side.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.side.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.8.side.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.side.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehives/beehive.8.top.png b/src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehives/beehive.8.top.png rename to src/main/resources/assets/forestry/textures/blocks/beehives/beehive.8.top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehouse.0.png b/src/main/resources/assets/forestry/textures/blocks/beehouse.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehouse.0.png rename to src/main/resources/assets/forestry/textures/blocks/beehouse.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehouse.1.png b/src/main/resources/assets/forestry/textures/blocks/beehouse.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehouse.1.png rename to src/main/resources/assets/forestry/textures/blocks/beehouse.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehouse.2.png b/src/main/resources/assets/forestry/textures/blocks/beehouse.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehouse.2.png rename to src/main/resources/assets/forestry/textures/blocks/beehouse.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehouse.4.png b/src/main/resources/assets/forestry/textures/blocks/beehouse.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehouse.4.png rename to src/main/resources/assets/forestry/textures/blocks/beehouse.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/beehouse.7.png b/src/main/resources/assets/forestry/textures/blocks/beehouse.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/beehouse.7.png rename to src/main/resources/assets/forestry/textures/blocks/beehouse.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/block_0_14.png b/src/main/resources/assets/forestry/textures/blocks/block_0_14.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/block_0_14.png rename to src/main/resources/assets/forestry/textures/blocks/block_0_14.png diff --git a/forestry_resources/assets/forestry/textures/blocks/block_12_13.png b/src/main/resources/assets/forestry/textures/blocks/block_12_13.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/block_12_13.png rename to src/main/resources/assets/forestry/textures/blocks/block_12_13.png diff --git a/forestry_resources/assets/forestry/textures/blocks/block_12_14.png b/src/main/resources/assets/forestry/textures/blocks/block_12_14.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/block_12_14.png rename to src/main/resources/assets/forestry/textures/blocks/block_12_14.png diff --git a/forestry_resources/assets/forestry/textures/blocks/block_12_15.png b/src/main/resources/assets/forestry/textures/blocks/block_12_15.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/block_12_15.png rename to src/main/resources/assets/forestry/textures/blocks/block_12_15.png diff --git a/forestry_resources/assets/forestry/textures/blocks/block_13_14.png b/src/main/resources/assets/forestry/textures/blocks/block_13_14.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/block_13_14.png rename to src/main/resources/assets/forestry/textures/blocks/block_13_14.png diff --git a/forestry_resources/assets/forestry/textures/blocks/block_13_15.png b/src/main/resources/assets/forestry/textures/blocks/block_13_15.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/block_13_15.png rename to src/main/resources/assets/forestry/textures/blocks/block_13_15.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler.0.png b/src/main/resources/assets/forestry/textures/blocks/bottler.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler.0.png rename to src/main/resources/assets/forestry/textures/blocks/bottler.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_base.png b/src/main/resources/assets/forestry/textures/blocks/bottler_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_base.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_high.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png rename to src/main/resources/assets/forestry/textures/blocks/bottler_tank_resource_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/candle.png b/src/main/resources/assets/forestry/textures/blocks/candle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/candle.png rename to src/main/resources/assets/forestry/textures/blocks/candle.png diff --git a/forestry_resources/assets/forestry/textures/blocks/candleStumpLit.png b/src/main/resources/assets/forestry/textures/blocks/candleStumpLit.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/candleStumpLit.png rename to src/main/resources/assets/forestry/textures/blocks/candleStumpLit.png diff --git a/forestry_resources/assets/forestry/textures/blocks/candleStumpUnlit.png b/src/main/resources/assets/forestry/textures/blocks/candleStumpUnlit.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/candleStumpUnlit.png rename to src/main/resources/assets/forestry/textures/blocks/candleStumpUnlit.png diff --git a/forestry_resources/assets/forestry/textures/blocks/candleTipLit.png b/src/main/resources/assets/forestry/textures/blocks/candleTipLit.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/candleTipLit.png rename to src/main/resources/assets/forestry/textures/blocks/candleTipLit.png diff --git a/forestry_resources/assets/forestry/textures/blocks/candleTipUnlit.png b/src/main/resources/assets/forestry/textures/blocks/candleTipUnlit.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/candleTipUnlit.png rename to src/main/resources/assets/forestry/textures/blocks/candleTipUnlit.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter.0.png b/src/main/resources/assets/forestry/textures/blocks/carpenter.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter.0.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_base.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_base.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_low.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/carpenter_tank_resource_medium.png rename to src/main/resources/assets/forestry/textures/blocks/carpenter_tank_resource_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/centrifuge.0.png b/src/main/resources/assets/forestry/textures/blocks/centrifuge.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/centrifuge.0.png rename to src/main/resources/assets/forestry/textures/blocks/centrifuge.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/centrifuge_base.png b/src/main/resources/assets/forestry/textures/blocks/centrifuge_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/centrifuge_base.png rename to src/main/resources/assets/forestry/textures/blocks/centrifuge_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/centrifuge_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/centrifuge_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/centrifuge_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/centrifuge_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/centrifuge_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/centrifuge_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/centrifuge_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/centrifuge_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_bronze_base.png b/src/main/resources/assets/forestry/textures/blocks/engine_bronze_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_bronze_base.png rename to src/main/resources/assets/forestry/textures/blocks/engine_bronze_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_bronze_extension.png b/src/main/resources/assets/forestry/textures/blocks/engine_bronze_extension.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_bronze_extension.png rename to src/main/resources/assets/forestry/textures/blocks/engine_bronze_extension.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_bronze_piston.png b/src/main/resources/assets/forestry/textures/blocks/engine_bronze_piston.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_bronze_piston.png rename to src/main/resources/assets/forestry/textures/blocks/engine_bronze_piston.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_clock_base.png b/src/main/resources/assets/forestry/textures/blocks/engine_clock_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_clock_base.png rename to src/main/resources/assets/forestry/textures/blocks/engine_clock_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_clock_extension.png b/src/main/resources/assets/forestry/textures/blocks/engine_clock_extension.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_clock_extension.png rename to src/main/resources/assets/forestry/textures/blocks/engine_clock_extension.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_clock_piston.png b/src/main/resources/assets/forestry/textures/blocks/engine_clock_piston.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_clock_piston.png rename to src/main/resources/assets/forestry/textures/blocks/engine_clock_piston.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_copper_base.png b/src/main/resources/assets/forestry/textures/blocks/engine_copper_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_copper_base.png rename to src/main/resources/assets/forestry/textures/blocks/engine_copper_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_copper_extension.png b/src/main/resources/assets/forestry/textures/blocks/engine_copper_extension.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_copper_extension.png rename to src/main/resources/assets/forestry/textures/blocks/engine_copper_extension.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_copper_piston.png b/src/main/resources/assets/forestry/textures/blocks/engine_copper_piston.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_copper_piston.png rename to src/main/resources/assets/forestry/textures/blocks/engine_copper_piston.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_tin_base.png b/src/main/resources/assets/forestry/textures/blocks/engine_tin_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_tin_base.png rename to src/main/resources/assets/forestry/textures/blocks/engine_tin_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_tin_extension.png b/src/main/resources/assets/forestry/textures/blocks/engine_tin_extension.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_tin_extension.png rename to src/main/resources/assets/forestry/textures/blocks/engine_tin_extension.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_tin_piston.png b/src/main/resources/assets/forestry/textures/blocks/engine_tin_piston.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_tin_piston.png rename to src/main/resources/assets/forestry/textures/blocks/engine_tin_piston.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_trunk_high.png b/src/main/resources/assets/forestry/textures/blocks/engine_trunk_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_trunk_high.png rename to src/main/resources/assets/forestry/textures/blocks/engine_trunk_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_trunk_higher.png b/src/main/resources/assets/forestry/textures/blocks/engine_trunk_higher.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_trunk_higher.png rename to src/main/resources/assets/forestry/textures/blocks/engine_trunk_higher.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_trunk_highest.png b/src/main/resources/assets/forestry/textures/blocks/engine_trunk_highest.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_trunk_highest.png rename to src/main/resources/assets/forestry/textures/blocks/engine_trunk_highest.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_trunk_low.png b/src/main/resources/assets/forestry/textures/blocks/engine_trunk_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_trunk_low.png rename to src/main/resources/assets/forestry/textures/blocks/engine_trunk_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engine_trunk_medium.png b/src/main/resources/assets/forestry/textures/blocks/engine_trunk_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engine_trunk_medium.png rename to src/main/resources/assets/forestry/textures/blocks/engine_trunk_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/enginebronze.0.png b/src/main/resources/assets/forestry/textures/blocks/enginebronze.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/enginebronze.0.png rename to src/main/resources/assets/forestry/textures/blocks/enginebronze.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/engineclockwork.0.png b/src/main/resources/assets/forestry/textures/blocks/engineclockwork.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/engineclockwork.0.png rename to src/main/resources/assets/forestry/textures/blocks/engineclockwork.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/enginecopper.0.png b/src/main/resources/assets/forestry/textures/blocks/enginecopper.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/enginecopper.0.png rename to src/main/resources/assets/forestry/textures/blocks/enginecopper.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/enginetin.0.png b/src/main/resources/assets/forestry/textures/blocks/enginetin.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/enginetin.0.png rename to src/main/resources/assets/forestry/textures/blocks/enginetin.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/escritoire.0.png b/src/main/resources/assets/forestry/textures/blocks/escritoire.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/escritoire.0.png rename to src/main/resources/assets/forestry/textures/blocks/escritoire.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/escritoire.png b/src/main/resources/assets/forestry/textures/blocks/escritoire.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/escritoire.png rename to src/main/resources/assets/forestry/textures/blocks/escritoire.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fabricator.0.png b/src/main/resources/assets/forestry/textures/blocks/fabricator.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fabricator.0.png rename to src/main/resources/assets/forestry/textures/blocks/fabricator.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fabricator.1.png b/src/main/resources/assets/forestry/textures/blocks/fabricator.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fabricator.1.png rename to src/main/resources/assets/forestry/textures/blocks/fabricator.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fabricator.2.png b/src/main/resources/assets/forestry/textures/blocks/fabricator.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fabricator.2.png rename to src/main/resources/assets/forestry/textures/blocks/fabricator.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fabricator.3.png b/src/main/resources/assets/forestry/textures/blocks/fabricator.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fabricator.3.png rename to src/main/resources/assets/forestry/textures/blocks/fabricator.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fabricator.4.png b/src/main/resources/assets/forestry/textures/blocks/fabricator.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fabricator.4.png rename to src/main/resources/assets/forestry/textures/blocks/fabricator.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/band.png b/src/main/resources/assets/forestry/textures/blocks/farm/band.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/band.png rename to src/main/resources/assets/forestry/textures/blocks/farm/band.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/control.png b/src/main/resources/assets/forestry/textures/blocks/farm/control.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/control.png rename to src/main/resources/assets/forestry/textures/blocks/farm/control.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/gears.png b/src/main/resources/assets/forestry/textures/blocks/farm/gears.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/gears.png rename to src/main/resources/assets/forestry/textures/blocks/farm/gears.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/hatch.png b/src/main/resources/assets/forestry/textures/blocks/farm/hatch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/hatch.png rename to src/main/resources/assets/forestry/textures/blocks/farm/hatch.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/plain.png b/src/main/resources/assets/forestry/textures/blocks/farm/plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/plain.png rename to src/main/resources/assets/forestry/textures/blocks/farm/plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/reverse.png b/src/main/resources/assets/forestry/textures/blocks/farm/reverse.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/reverse.png rename to src/main/resources/assets/forestry/textures/blocks/farm/reverse.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/top.png b/src/main/resources/assets/forestry/textures/blocks/farm/top.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/top.png rename to src/main/resources/assets/forestry/textures/blocks/farm/top.png diff --git a/forestry_resources/assets/forestry/textures/blocks/farm/valve.png b/src/main/resources/assets/forestry/textures/blocks/farm/valve.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/farm/valve.png rename to src/main/resources/assets/forestry/textures/blocks/farm/valve.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter.0.png b/src/main/resources/assets/forestry/textures/blocks/fermenter.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter.0.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_base.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_base.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_high.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_high.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_medium.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_product_medium.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_product_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_high.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_low.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/fermenter_tank_resource_medium.png rename to src/main/resources/assets/forestry/textures/blocks/fermenter_tank_resource_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator.0.png b/src/main/resources/assets/forestry/textures/blocks/generator.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator.0.png rename to src/main/resources/assets/forestry/textures/blocks/generator.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_base.png b/src/main/resources/assets/forestry/textures/blocks/generator_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_base.png rename to src/main/resources/assets/forestry/textures/blocks/generator_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/generator_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_high.png rename to src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_low.png rename to src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/generator_tank_resource_medium.png rename to src/main/resources/assets/forestry/textures/blocks/generator_tank_resource_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeAcacia.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeAcacia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeAcacia.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeAcacia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeBalsa.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBalsa.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeBalsa.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBalsa.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeBaobab.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBaobab.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeBaobab.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeBaobab.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeCherry.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCherry.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeCherry.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeCherry.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeChestnut.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeChestnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeChestnut.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeChestnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeDate.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeDate.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeDate.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeDate.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeEbony.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeEbony.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeEbony.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeEbony.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeGigant.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeGigant.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeGigant.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeGigant.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeKapok.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeKapok.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeKapok.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeKapok.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeLarch.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLarch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeLarch.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLarch.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeLemon.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLemon.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeLemon.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLemon.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeLime.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLime.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeLime.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeLime.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeMahoe.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahoe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeMahoe.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahoe.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeMahogony.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahogony.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeMahogony.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMahogony.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeMaple.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMaple.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeMaple.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeMaple.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePapaya.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePapaya.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePapaya.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePapaya.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePine.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePine.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePine.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePlum.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePlum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePlum.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePlum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePoplar.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePoplar.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treePoplar.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treePoplar.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeRubber.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeRubber.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeRubber.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeRubber.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeSequioa.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequioa.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeSequioa.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSequioa.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeSipiri.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSipiri.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeSipiri.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeSipiri.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeTeak.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeTeak.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeTeak.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeTeak.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeWalnut.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWalnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeWalnut.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWalnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeWenge.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWenge.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeWenge.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWenge.png diff --git a/forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeWillow.png b/src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWillow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/germlings/sapling.treeWillow.png rename to src/main/resources/assets/forestry/textures/blocks/germlings/sapling.treeWillow.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/conifers.changed.png b/src/main/resources/assets/forestry/textures/blocks/leaves/conifers.changed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/conifers.changed.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/conifers.changed.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/conifers.fancy.png b/src/main/resources/assets/forestry/textures/blocks/leaves/conifers.fancy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/conifers.fancy.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/conifers.fancy.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/conifers.plain.png b/src/main/resources/assets/forestry/textures/blocks/leaves/conifers.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/conifers.plain.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/conifers.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/deciduous.changed.png b/src/main/resources/assets/forestry/textures/blocks/leaves/deciduous.changed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/deciduous.changed.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/deciduous.changed.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/deciduous.fancy.png b/src/main/resources/assets/forestry/textures/blocks/leaves/deciduous.fancy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/deciduous.fancy.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/deciduous.fancy.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/deciduous.plain.png b/src/main/resources/assets/forestry/textures/blocks/leaves/deciduous.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/deciduous.plain.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/deciduous.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/fruits.berries.png b/src/main/resources/assets/forestry/textures/blocks/leaves/fruits.berries.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/fruits.berries.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/fruits.berries.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/fruits.citrus.png b/src/main/resources/assets/forestry/textures/blocks/leaves/fruits.citrus.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/fruits.citrus.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/fruits.citrus.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/fruits.nuts.png b/src/main/resources/assets/forestry/textures/blocks/leaves/fruits.nuts.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/fruits.nuts.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/fruits.nuts.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/fruits.plums.png b/src/main/resources/assets/forestry/textures/blocks/leaves/fruits.plums.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/fruits.plums.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/fruits.plums.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/fruits.pomes.png b/src/main/resources/assets/forestry/textures/blocks/leaves/fruits.pomes.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/fruits.pomes.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/fruits.pomes.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/jungle.changed.png b/src/main/resources/assets/forestry/textures/blocks/leaves/jungle.changed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/jungle.changed.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/jungle.changed.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/jungle.fancy.png b/src/main/resources/assets/forestry/textures/blocks/leaves/jungle.fancy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/jungle.fancy.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/jungle.fancy.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/jungle.plain.png b/src/main/resources/assets/forestry/textures/blocks/leaves/jungle.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/jungle.plain.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/jungle.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/maple.changed.png b/src/main/resources/assets/forestry/textures/blocks/leaves/maple.changed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/maple.changed.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/maple.changed.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/maple.fancy.png b/src/main/resources/assets/forestry/textures/blocks/leaves/maple.fancy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/maple.fancy.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/maple.fancy.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/maple.plain.png b/src/main/resources/assets/forestry/textures/blocks/leaves/maple.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/maple.plain.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/maple.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/palm.changed.png b/src/main/resources/assets/forestry/textures/blocks/leaves/palm.changed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/palm.changed.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/palm.changed.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/palm.fancy.png b/src/main/resources/assets/forestry/textures/blocks/leaves/palm.fancy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/palm.fancy.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/palm.fancy.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/palm.plain.png b/src/main/resources/assets/forestry/textures/blocks/leaves/palm.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/palm.plain.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/palm.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/tile]-103.png b/src/main/resources/assets/forestry/textures/blocks/leaves/tile]-103.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/tile]-103.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/tile]-103.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/tile]-52.png b/src/main/resources/assets/forestry/textures/blocks/leaves/tile]-52.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/tile]-52.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/tile]-52.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/tile]-68.png b/src/main/resources/assets/forestry/textures/blocks/leaves/tile]-68.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/tile]-68.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/tile]-68.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/tile]-98.png b/src/main/resources/assets/forestry/textures/blocks/leaves/tile]-98.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/tile]-98.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/tile]-98.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/willow.changed.png b/src/main/resources/assets/forestry/textures/blocks/leaves/willow.changed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/willow.changed.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/willow.changed.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/willow.fancy.png b/src/main/resources/assets/forestry/textures/blocks/leaves/willow.fancy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/willow.fancy.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/willow.fancy.png diff --git a/forestry_resources/assets/forestry/textures/blocks/leaves/willow.plain.png b/src/main/resources/assets/forestry/textures/blocks/leaves/willow.plain.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/leaves/willow.plain.png rename to src/main/resources/assets/forestry/textures/blocks/leaves/willow.plain.png diff --git a/forestry_resources/assets/forestry/textures/blocks/lepichest.0.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/lepichest.0.png rename to src/main/resources/assets/forestry/textures/blocks/lepichest.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/lepichest.1.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/lepichest.1.png rename to src/main/resources/assets/forestry/textures/blocks/lepichest.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/lepichest.2.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/lepichest.2.png rename to src/main/resources/assets/forestry/textures/blocks/lepichest.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/lepichest.3.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/lepichest.3.png rename to src/main/resources/assets/forestry/textures/blocks/lepichest.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/lepichest.4.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/lepichest.4.png rename to src/main/resources/assets/forestry/textures/blocks/lepichest.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/lepichest.7.png b/src/main/resources/assets/forestry/textures/blocks/lepichest.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/lepichest.7.png rename to src/main/resources/assets/forestry/textures/blocks/lepichest.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/bioethanol.png b/src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/bioethanol.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/bioethanol.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/bioethanol.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/bioethanol.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/biomass.png b/src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/biomass.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/biomass.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/biomass.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/biomass.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/glass.png b/src/main/resources/assets/forestry/textures/blocks/liquid/glass.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/glass.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/glass.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/glass.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/glass.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/glass.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/glass.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/honey.png b/src/main/resources/assets/forestry/textures/blocks/liquid/honey.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/honey.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/honey.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/honey.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/honey.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/honey.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/honey.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/ice.png b/src/main/resources/assets/forestry/textures/blocks/liquid/ice.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/ice.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/ice.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/ice.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/ice.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/ice.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/ice.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/juice.png b/src/main/resources/assets/forestry/textures/blocks/liquid/juice.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/juice.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/juice.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/juice.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/juice.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/juice.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/juice.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/milk.png b/src/main/resources/assets/forestry/textures/blocks/liquid/milk.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/milk.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/milk.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/seedoil.png b/src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/seedoil.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/seedoil.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/seedoil.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/seedoil.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/short.mead.png b/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/short.mead.png rename to src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png diff --git a/forestry_resources/assets/forestry/textures/blocks/liquid/short.mead.png.mcmeta b/src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/liquid/short.mead.png.mcmeta rename to src/main/resources/assets/forestry/textures/blocks/liquid/short.mead.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/blocks/mailbox.0.png b/src/main/resources/assets/forestry/textures/blocks/mailbox.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/mailbox.0.png rename to src/main/resources/assets/forestry/textures/blocks/mailbox.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/mailbox.1.png b/src/main/resources/assets/forestry/textures/blocks/mailbox.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/mailbox.1.png rename to src/main/resources/assets/forestry/textures/blocks/mailbox.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/mailbox.2.png b/src/main/resources/assets/forestry/textures/blocks/mailbox.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/mailbox.2.png rename to src/main/resources/assets/forestry/textures/blocks/mailbox.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/mailbox.7.png b/src/main/resources/assets/forestry/textures/blocks/mailbox.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/mailbox.7.png rename to src/main/resources/assets/forestry/textures/blocks/mailbox.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener.0.png b/src/main/resources/assets/forestry/textures/blocks/moistener.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener.0.png rename to src/main/resources/assets/forestry/textures/blocks/moistener.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_base.png b/src/main/resources/assets/forestry/textures/blocks/moistener_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_base.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/moistener_tank_resource_medium.png rename to src/main/resources/assets/forestry/textures/blocks/moistener_tank_resource_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/ores/apatite.png b/src/main/resources/assets/forestry/textures/blocks/ores/apatite.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/ores/apatite.png rename to src/main/resources/assets/forestry/textures/blocks/ores/apatite.png diff --git a/forestry_resources/assets/forestry/textures/blocks/ores/copper.png b/src/main/resources/assets/forestry/textures/blocks/ores/copper.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/ores/copper.png rename to src/main/resources/assets/forestry/textures/blocks/ores/copper.png diff --git a/forestry_resources/assets/forestry/textures/blocks/ores/tin.png b/src/main/resources/assets/forestry/textures/blocks/ores/tin.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/ores/tin.png rename to src/main/resources/assets/forestry/textures/blocks/ores/tin.png diff --git a/forestry_resources/assets/forestry/textures/blocks/philatelist.0.png b/src/main/resources/assets/forestry/textures/blocks/philatelist.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/philatelist.0.png rename to src/main/resources/assets/forestry/textures/blocks/philatelist.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/philatelist.1.png b/src/main/resources/assets/forestry/textures/blocks/philatelist.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/philatelist.1.png rename to src/main/resources/assets/forestry/textures/blocks/philatelist.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/philatelist.2.png b/src/main/resources/assets/forestry/textures/blocks/philatelist.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/philatelist.2.png rename to src/main/resources/assets/forestry/textures/blocks/philatelist.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/philatelist.3.png b/src/main/resources/assets/forestry/textures/blocks/philatelist.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/philatelist.3.png rename to src/main/resources/assets/forestry/textures/blocks/philatelist.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/philatelist.7.png b/src/main/resources/assets/forestry/textures/blocks/philatelist.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/philatelist.7.png rename to src/main/resources/assets/forestry/textures/blocks/philatelist.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.black.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.black.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.black.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.black.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.blue.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.blue.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.blue.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.blue.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.empty.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.empty.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.green.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.green.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.green.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.green.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.red.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.red.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.red.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.red.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.white.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.white.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.white.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.white.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.yellow.png b/src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.yellow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pipes/pipe_prop.yellow.png rename to src/main/resources/assets/forestry/textures/blocks/pipes/pipe_prop.yellow.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pods/dates.0.png b/src/main/resources/assets/forestry/textures/blocks/pods/dates.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pods/dates.0.png rename to src/main/resources/assets/forestry/textures/blocks/pods/dates.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pods/dates.1.png b/src/main/resources/assets/forestry/textures/blocks/pods/dates.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pods/dates.1.png rename to src/main/resources/assets/forestry/textures/blocks/pods/dates.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pods/dates.2.png b/src/main/resources/assets/forestry/textures/blocks/pods/dates.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pods/dates.2.png rename to src/main/resources/assets/forestry/textures/blocks/pods/dates.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pods/papaya.0.png b/src/main/resources/assets/forestry/textures/blocks/pods/papaya.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pods/papaya.0.png rename to src/main/resources/assets/forestry/textures/blocks/pods/papaya.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pods/papaya.1.png b/src/main/resources/assets/forestry/textures/blocks/pods/papaya.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pods/papaya.1.png rename to src/main/resources/assets/forestry/textures/blocks/pods/papaya.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/pods/papaya.2.png b/src/main/resources/assets/forestry/textures/blocks/pods/papaya.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/pods/papaya.2.png rename to src/main/resources/assets/forestry/textures/blocks/pods/papaya.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker.0.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker.0.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_blade1.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_blade1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_blade1.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_blade1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_blade2.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_blade2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_blade2.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_blade2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_0.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_0.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_1.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_1.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_2.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_2.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_3.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_3.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_4.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_4.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_5.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_5.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_5.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_5.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_6.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_6.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_6.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_6.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_column_7.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_column_7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_column_7.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_column_7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_extension.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_extension.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_extension.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_extension.png diff --git a/forestry_resources/assets/forestry/textures/blocks/rainmaker_pedestal.png b/src/main/resources/assets/forestry/textures/blocks/rainmaker_pedestal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/rainmaker_pedestal.png rename to src/main/resources/assets/forestry/textures/blocks/rainmaker_pedestal.png diff --git a/forestry_resources/assets/forestry/textures/blocks/raintank.0.png b/src/main/resources/assets/forestry/textures/blocks/raintank.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/raintank.0.png rename to src/main/resources/assets/forestry/textures/blocks/raintank.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/raintank.1.png b/src/main/resources/assets/forestry/textures/blocks/raintank.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/raintank.1.png rename to src/main/resources/assets/forestry/textures/blocks/raintank.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/soil/bog.png b/src/main/resources/assets/forestry/textures/blocks/soil/bog.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/soil/bog.png rename to src/main/resources/assets/forestry/textures/blocks/soil/bog.png diff --git a/forestry_resources/assets/forestry/textures/blocks/soil/humus.png b/src/main/resources/assets/forestry/textures/blocks/soil/humus.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/soil/humus.png rename to src/main/resources/assets/forestry/textures/blocks/soil/humus.png diff --git a/forestry_resources/assets/forestry/textures/blocks/soil/peat.png b/src/main/resources/assets/forestry/textures/blocks/soil/peat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/soil/peat.png rename to src/main/resources/assets/forestry/textures/blocks/soil/peat.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer.0.png b/src/main/resources/assets/forestry/textures/blocks/squeezer.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer.0.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_base.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_base.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_low.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_low.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_maximum.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_tank_product_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/squeezer_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/squeezer_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/squeezer_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/squeezer_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/0.png b/src/main/resources/assets/forestry/textures/blocks/stained/0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/0.png rename to src/main/resources/assets/forestry/textures/blocks/stained/0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/1.png b/src/main/resources/assets/forestry/textures/blocks/stained/1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/1.png rename to src/main/resources/assets/forestry/textures/blocks/stained/1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/10.png b/src/main/resources/assets/forestry/textures/blocks/stained/10.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/10.png rename to src/main/resources/assets/forestry/textures/blocks/stained/10.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/11.png b/src/main/resources/assets/forestry/textures/blocks/stained/11.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/11.png rename to src/main/resources/assets/forestry/textures/blocks/stained/11.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/12.png b/src/main/resources/assets/forestry/textures/blocks/stained/12.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/12.png rename to src/main/resources/assets/forestry/textures/blocks/stained/12.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/13.png b/src/main/resources/assets/forestry/textures/blocks/stained/13.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/13.png rename to src/main/resources/assets/forestry/textures/blocks/stained/13.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/14.png b/src/main/resources/assets/forestry/textures/blocks/stained/14.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/14.png rename to src/main/resources/assets/forestry/textures/blocks/stained/14.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/15.png b/src/main/resources/assets/forestry/textures/blocks/stained/15.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/15.png rename to src/main/resources/assets/forestry/textures/blocks/stained/15.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/2.png b/src/main/resources/assets/forestry/textures/blocks/stained/2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/2.png rename to src/main/resources/assets/forestry/textures/blocks/stained/2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/3.png b/src/main/resources/assets/forestry/textures/blocks/stained/3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/3.png rename to src/main/resources/assets/forestry/textures/blocks/stained/3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/4.png b/src/main/resources/assets/forestry/textures/blocks/stained/4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/4.png rename to src/main/resources/assets/forestry/textures/blocks/stained/4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/5.png b/src/main/resources/assets/forestry/textures/blocks/stained/5.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/5.png rename to src/main/resources/assets/forestry/textures/blocks/stained/5.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/6.png b/src/main/resources/assets/forestry/textures/blocks/stained/6.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/6.png rename to src/main/resources/assets/forestry/textures/blocks/stained/6.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/7.png b/src/main/resources/assets/forestry/textures/blocks/stained/7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/7.png rename to src/main/resources/assets/forestry/textures/blocks/stained/7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/8.png b/src/main/resources/assets/forestry/textures/blocks/stained/8.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/8.png rename to src/main/resources/assets/forestry/textures/blocks/stained/8.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stained/9.png b/src/main/resources/assets/forestry/textures/blocks/stained/9.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stained/9.png rename to src/main/resources/assets/forestry/textures/blocks/stained/9.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still.0.png b/src/main/resources/assets/forestry/textures/blocks/still.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still.0.png rename to src/main/resources/assets/forestry/textures/blocks/still.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_base.png b/src/main/resources/assets/forestry/textures/blocks/still_base.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_base.png rename to src/main/resources/assets/forestry/textures/blocks/still_base.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_product_empty.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_product_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_product_empty.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_product_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_product_high.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_product_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_product_high.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_product_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_product_low.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_product_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_product_low.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_product_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_product_maximum.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_product_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_product_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_product_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_product_medium.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_product_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_product_medium.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_product_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_empty.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_resource_empty.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_resource_empty.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_resource_high.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_high.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_resource_high.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_resource_high.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_resource_low.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_low.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_resource_low.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_resource_low.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_resource_maximum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/still_tank_resource_medium.png b/src/main/resources/assets/forestry/textures/blocks/still_tank_resource_medium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/still_tank_resource_medium.png rename to src/main/resources/assets/forestry/textures/blocks/still_tank_resource_medium.png diff --git a/forestry_resources/assets/forestry/textures/blocks/stump.png b/src/main/resources/assets/forestry/textures/blocks/stump.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/stump.png rename to src/main/resources/assets/forestry/textures/blocks/stump.png diff --git a/forestry_resources/assets/forestry/textures/blocks/tradestation.0.png b/src/main/resources/assets/forestry/textures/blocks/tradestation.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/tradestation.0.png rename to src/main/resources/assets/forestry/textures/blocks/tradestation.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/tradestation.1.png b/src/main/resources/assets/forestry/textures/blocks/tradestation.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/tradestation.1.png rename to src/main/resources/assets/forestry/textures/blocks/tradestation.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/tradestation.2.png b/src/main/resources/assets/forestry/textures/blocks/tradestation.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/tradestation.2.png rename to src/main/resources/assets/forestry/textures/blocks/tradestation.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/tradestation.3.png b/src/main/resources/assets/forestry/textures/blocks/tradestation.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/tradestation.3.png rename to src/main/resources/assets/forestry/textures/blocks/tradestation.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/tradestation.4.png b/src/main/resources/assets/forestry/textures/blocks/tradestation.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/tradestation.4.png rename to src/main/resources/assets/forestry/textures/blocks/tradestation.4.png diff --git a/forestry_resources/assets/forestry/textures/blocks/tradestation.7.png b/src/main/resources/assets/forestry/textures/blocks/tradestation.7.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/tradestation.7.png rename to src/main/resources/assets/forestry/textures/blocks/tradestation.7.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.acacia.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.acacia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.acacia.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.acacia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.balsa.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.balsa.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.balsa.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.balsa.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.baobab.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.baobab.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.baobab.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.baobab.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.cherry.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.cherry.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.cherry.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.cherry.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.chestnut.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.chestnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.chestnut.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.chestnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.citrus.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.citrus.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.citrus.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.citrus.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.ebony.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.ebony.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.ebony.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.ebony.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.giganteum.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.giganteum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.giganteum.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.giganteum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.greenheart.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.greenheart.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.greenheart.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.greenheart.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.kapok.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.kapok.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.kapok.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.kapok.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.larch.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.larch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.larch.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.larch.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.lime.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.lime.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.lime.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.lime.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.mahoe.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.mahoe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.mahoe.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.mahoe.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.mahogany.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.mahogany.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.mahogany.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.mahogany.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.maple.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.maple.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.maple.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.maple.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.palm.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.palm.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.palm.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.palm.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.papaya.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.papaya.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.papaya.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.papaya.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.pine.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.pine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.pine.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.pine.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.plum.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.plum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.plum.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.plum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.poplar.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.poplar.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.poplar.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.poplar.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.sequoia.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.sequoia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.sequoia.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.sequoia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.teak.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.teak.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.teak.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.teak.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.walnut.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.walnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.walnut.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.walnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.wenge.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.wenge.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.wenge.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.wenge.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/bark.willow.png b/src/main/resources/assets/forestry/textures/blocks/wood/bark.willow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/bark.willow.png rename to src/main/resources/assets/forestry/textures/blocks/wood/bark.willow.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.acacia.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.acacia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.acacia.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.acacia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.balsa.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.balsa.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.balsa.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.balsa.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.baobab.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.baobab.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.baobab.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.baobab.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.cherry.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.cherry.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.cherry.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.cherry.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.chestnut.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.chestnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.chestnut.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.chestnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.citrus.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.citrus.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.citrus.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.citrus.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.ebony.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.ebony.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.ebony.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.ebony.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.giganteum.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.giganteum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.giganteum.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.giganteum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.greenheart.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.greenheart.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.greenheart.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.greenheart.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.kapok.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.kapok.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.kapok.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.kapok.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.larch.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.larch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.larch.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.larch.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.lime.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.lime.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.lime.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.lime.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.mahoe.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.mahoe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.mahoe.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.mahoe.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.mahogany.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.mahogany.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.mahogany.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.mahogany.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.maple.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.maple.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.maple.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.maple.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.palm.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.palm.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.palm.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.palm.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.papaya.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.papaya.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.papaya.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.papaya.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.pine.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.pine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.pine.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.pine.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.plum.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.plum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.plum.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.plum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.poplar.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.poplar.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.poplar.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.poplar.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.sequoia.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.sequoia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.sequoia.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.sequoia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.teak.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.teak.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.teak.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.teak.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.walnut.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.walnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.walnut.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.walnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.wenge.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.wenge.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.wenge.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.wenge.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/heart.willow.png b/src/main/resources/assets/forestry/textures/blocks/wood/heart.willow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/heart.willow.png rename to src/main/resources/assets/forestry/textures/blocks/wood/heart.willow.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.acacia.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.acacia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.acacia.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.acacia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.balsa.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.balsa.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.balsa.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.balsa.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.baobab.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.baobab.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.baobab.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.baobab.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.cherry.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.cherry.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.cherry.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.cherry.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.chestnut.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.chestnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.chestnut.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.chestnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.citrus.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.citrus.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.citrus.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.citrus.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.ebony.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.ebony.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.ebony.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.ebony.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.greenheart.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.greenheart.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.greenheart.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.greenheart.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.kapok.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.kapok.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.kapok.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.kapok.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.larch.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.larch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.larch.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.larch.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.lime.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.lime.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.lime.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.lime.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.mahoe.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.mahoe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.mahoe.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.mahoe.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.mahogany.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.mahogany.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.mahogany.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.mahogany.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.maple.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.maple.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.maple.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.maple.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.palm.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.palm.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.palm.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.palm.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.papaya.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.papaya.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.papaya.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.papaya.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.pine.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.pine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.pine.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.pine.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.plum.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.plum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.plum.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.plum.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.poplar.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.poplar.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.poplar.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.poplar.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.sequoia.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.sequoia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.sequoia.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.sequoia.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.teak.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.teak.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.teak.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.teak.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.walnut.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.walnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.walnut.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.walnut.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.wenge.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.wenge.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.wenge.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.wenge.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/planks.willow.png b/src/main/resources/assets/forestry/textures/blocks/wood/planks.willow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/planks.willow.png rename to src/main/resources/assets/forestry/textures/blocks/wood/planks.willow.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/tile]-120.png b/src/main/resources/assets/forestry/textures/blocks/wood/tile]-120.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/tile]-120.png rename to src/main/resources/assets/forestry/textures/blocks/wood/tile]-120.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/tile]-127.png b/src/main/resources/assets/forestry/textures/blocks/wood/tile]-127.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/tile]-127.png rename to src/main/resources/assets/forestry/textures/blocks/wood/tile]-127.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/tile]-142.png b/src/main/resources/assets/forestry/textures/blocks/wood/tile]-142.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/tile]-142.png rename to src/main/resources/assets/forestry/textures/blocks/wood/tile]-142.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/tile]-143.png b/src/main/resources/assets/forestry/textures/blocks/wood/tile]-143.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/tile]-143.png rename to src/main/resources/assets/forestry/textures/blocks/wood/tile]-143.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/tile]-158.png b/src/main/resources/assets/forestry/textures/blocks/wood/tile]-158.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/tile]-158.png rename to src/main/resources/assets/forestry/textures/blocks/wood/tile]-158.png diff --git a/forestry_resources/assets/forestry/textures/blocks/wood/tile]-159.png b/src/main/resources/assets/forestry/textures/blocks/wood/tile]-159.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/wood/tile]-159.png rename to src/main/resources/assets/forestry/textures/blocks/wood/tile]-159.png diff --git a/forestry_resources/assets/forestry/textures/blocks/worktable.0.png b/src/main/resources/assets/forestry/textures/blocks/worktable.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/worktable.0.png rename to src/main/resources/assets/forestry/textures/blocks/worktable.0.png diff --git a/forestry_resources/assets/forestry/textures/blocks/worktable.1.png b/src/main/resources/assets/forestry/textures/blocks/worktable.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/worktable.1.png rename to src/main/resources/assets/forestry/textures/blocks/worktable.1.png diff --git a/forestry_resources/assets/forestry/textures/blocks/worktable.2.png b/src/main/resources/assets/forestry/textures/blocks/worktable.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/worktable.2.png rename to src/main/resources/assets/forestry/textures/blocks/worktable.2.png diff --git a/forestry_resources/assets/forestry/textures/blocks/worktable.3.png b/src/main/resources/assets/forestry/textures/blocks/worktable.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/worktable.3.png rename to src/main/resources/assets/forestry/textures/blocks/worktable.3.png diff --git a/forestry_resources/assets/forestry/textures/blocks/worktable.4.png b/src/main/resources/assets/forestry/textures/blocks/worktable.4.png similarity index 100% rename from forestry_resources/assets/forestry/textures/blocks/worktable.4.png rename to src/main/resources/assets/forestry/textures/blocks/worktable.4.png diff --git a/forestry_resources/assets/forestry/textures/entity/beekeeper.png b/src/main/resources/assets/forestry/textures/entity/beekeeper.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/beekeeper.png rename to src/main/resources/assets/forestry/textures/entity/beekeeper.png diff --git a/forestry_resources/assets/forestry/textures/entity/bees/endBee.png b/src/main/resources/assets/forestry/textures/entity/bees/endBee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/bees/endBee.png rename to src/main/resources/assets/forestry/textures/entity/bees/endBee.png diff --git a/forestry_resources/assets/forestry/textures/entity/bees/honeyBee.png b/src/main/resources/assets/forestry/textures/entity/bees/honeyBee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/bees/honeyBee.png rename to src/main/resources/assets/forestry/textures/entity/bees/honeyBee.png diff --git a/forestry_resources/assets/forestry/textures/entity/bees/icyBee.png b/src/main/resources/assets/forestry/textures/entity/bees/icyBee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/bees/icyBee.png rename to src/main/resources/assets/forestry/textures/entity/bees/icyBee.png diff --git a/forestry_resources/assets/forestry/textures/entity/bees/sinisterBee.png b/src/main/resources/assets/forestry/textures/entity/bees/sinisterBee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/bees/sinisterBee.png rename to src/main/resources/assets/forestry/textures/entity/bees/sinisterBee.png diff --git a/forestry_resources/assets/forestry/textures/entity/bees/tropicalBee.png b/src/main/resources/assets/forestry/textures/entity/bees/tropicalBee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/bees/tropicalBee.png rename to src/main/resources/assets/forestry/textures/entity/bees/tropicalBee.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiAurora.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiAurora.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiAurora.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiAurora.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiBatesia.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBatesia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiBatesia.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiBatesia.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiBlackSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlackSwallow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiBlackSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlackSwallow.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiBlueDuke.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueDuke.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiBlueDuke.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueDuke.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiBlueWing.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueWing.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiBlueWing.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiBlueWing.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiBrimstone.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiBrimstone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiBrimstone.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiBrimstone.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiCSpeckledWood.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiCSpeckledWood.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiCSpeckledWood.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiCSpeckledWood.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiCabbageWhite.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiCabbageWhite.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiCabbageWhite.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiCabbageWhite.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiCitrusSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiCitrusSwallow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiCitrusSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiCitrusSwallow.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiComma.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiComma.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiComma.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiComma.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiDianaFrit.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiDianaFrit.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiDianaFrit.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiDianaFrit.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiEmeraldPeacock.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiEmeraldPeacock.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiEmeraldPeacock.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiEmeraldPeacock.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiGlasswing.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlasswing.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiGlasswing.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlasswing.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiGlassyTiger.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlassyTiger.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiGlassyTiger.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiGlassyTiger.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiGozoraAzure.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiGozoraAzure.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiGozoraAzure.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiGozoraAzure.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiLLacewing.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiLLacewing.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiLLacewing.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiLLacewing.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiMBlueMorpho.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMBlueMorpho.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiMBlueMorpho.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiMBlueMorpho.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiMSpeckledWood.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMSpeckledWood.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiMSpeckledWood.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiMSpeckledWood.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiMalachite.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMalachite.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiMalachite.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiMalachite.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiMonarch.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiMonarch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiMonarch.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiMonarch.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiPBlueMorpho.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPBlueMorpho.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiPBlueMorpho.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiPBlueMorpho.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiPalaenoSulphur.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPalaenoSulphur.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiPalaenoSulphur.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiPalaenoSulphur.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiPostillion.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostillion.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiPostillion.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostillion.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiPostman.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostman.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiPostman.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiPostman.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiRBlueMorpho.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiRBlueMorpho.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiRBlueMorpho.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiRBlueMorpho.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiReseda.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiReseda.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiReseda.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiReseda.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiSpeckledWood.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpeckledWood.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiSpeckledWood.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpeckledWood.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiSpicebush.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpicebush.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiSpicebush.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpicebush.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiSpringAzure.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpringAzure.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiSpringAzure.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiSpringAzure.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiThoasSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiThoasSwallow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiThoasSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiThoasSwallow.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/lepiZebraSwallow.png b/src/main/resources/assets/forestry/textures/entity/butterflies/lepiZebraSwallow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/lepiZebraSwallow.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/lepiZebraSwallow.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/mothAtlas.png b/src/main/resources/assets/forestry/textures/entity/butterflies/mothAtlas.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/mothAtlas.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/mothAtlas.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/mothBrimstone.png b/src/main/resources/assets/forestry/textures/entity/butterflies/mothBrimstone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/mothBrimstone.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/mothBrimstone.png diff --git a/forestry_resources/assets/forestry/textures/entity/butterflies/mothLatticedHeath.png b/src/main/resources/assets/forestry/textures/entity/butterflies/mothLatticedHeath.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/butterflies/mothLatticedHeath.png rename to src/main/resources/assets/forestry/textures/entity/butterflies/mothLatticedHeath.png diff --git a/forestry_resources/assets/forestry/textures/entity/lumberjack.png b/src/main/resources/assets/forestry/textures/entity/lumberjack.png similarity index 100% rename from forestry_resources/assets/forestry/textures/entity/lumberjack.png rename to src/main/resources/assets/forestry/textures/entity/lumberjack.png diff --git a/forestry_resources/assets/forestry/textures/gui/alveary.png b/src/main/resources/assets/forestry/textures/gui/alveary.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/alveary.png rename to src/main/resources/assets/forestry/textures/gui/alveary.png diff --git a/forestry_resources/assets/forestry/textures/gui/alyzer.png b/src/main/resources/assets/forestry/textures/gui/alyzer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/alyzer.png rename to src/main/resources/assets/forestry/textures/gui/alyzer.png diff --git a/forestry_resources/assets/forestry/textures/gui/analyzer.png b/src/main/resources/assets/forestry/textures/gui/analyzer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/analyzer.png rename to src/main/resources/assets/forestry/textures/gui/analyzer.png diff --git a/forestry_resources/assets/forestry/textures/gui/apiaristinventory.png b/src/main/resources/assets/forestry/textures/gui/apiaristinventory.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/apiaristinventory.png rename to src/main/resources/assets/forestry/textures/gui/apiaristinventory.png diff --git a/forestry_resources/assets/forestry/textures/gui/apiary.png b/src/main/resources/assets/forestry/textures/gui/apiary.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/apiary.png rename to src/main/resources/assets/forestry/textures/gui/apiary.png diff --git a/forestry_resources/assets/forestry/textures/gui/atlas.png b/src/main/resources/assets/forestry/textures/gui/atlas.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/atlas.png rename to src/main/resources/assets/forestry/textures/gui/atlas.png diff --git a/forestry_resources/assets/forestry/textures/gui/backpack.png b/src/main/resources/assets/forestry/textures/gui/backpack.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/backpack.png rename to src/main/resources/assets/forestry/textures/gui/backpack.png diff --git a/forestry_resources/assets/forestry/textures/gui/backpackT2.png b/src/main/resources/assets/forestry/textures/gui/backpackT2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/backpackT2.png rename to src/main/resources/assets/forestry/textures/gui/backpackT2.png diff --git a/forestry_resources/assets/forestry/textures/gui/beealyzer.png b/src/main/resources/assets/forestry/textures/gui/beealyzer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/beealyzer.png rename to src/main/resources/assets/forestry/textures/gui/beealyzer.png diff --git a/forestry_resources/assets/forestry/textures/gui/bioengine.png b/src/main/resources/assets/forestry/textures/gui/bioengine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/bioengine.png rename to src/main/resources/assets/forestry/textures/gui/bioengine.png diff --git a/forestry_resources/assets/forestry/textures/gui/biomefinder.png b/src/main/resources/assets/forestry/textures/gui/biomefinder.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/biomefinder.png rename to src/main/resources/assets/forestry/textures/gui/biomefinder.png diff --git a/forestry_resources/assets/forestry/textures/gui/bottler.png b/src/main/resources/assets/forestry/textures/gui/bottler.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/bottler.png rename to src/main/resources/assets/forestry/textures/gui/bottler.png diff --git a/forestry_resources/assets/forestry/textures/gui/buttons.png b/src/main/resources/assets/forestry/textures/gui/buttons.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/buttons.png rename to src/main/resources/assets/forestry/textures/gui/buttons.png diff --git a/forestry_resources/assets/forestry/textures/gui/carpenter.png b/src/main/resources/assets/forestry/textures/gui/carpenter.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/carpenter.png rename to src/main/resources/assets/forestry/textures/gui/carpenter.png diff --git a/forestry_resources/assets/forestry/textures/gui/centrifuge.png b/src/main/resources/assets/forestry/textures/gui/centrifuge.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/centrifuge.png rename to src/main/resources/assets/forestry/textures/gui/centrifuge.png diff --git a/forestry_resources/assets/forestry/textures/gui/electricalengine.png b/src/main/resources/assets/forestry/textures/gui/electricalengine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/electricalengine.png rename to src/main/resources/assets/forestry/textures/gui/electricalengine.png diff --git a/forestry_resources/assets/forestry/textures/gui/escritoire.png b/src/main/resources/assets/forestry/textures/gui/escritoire.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/escritoire.png rename to src/main/resources/assets/forestry/textures/gui/escritoire.png diff --git a/forestry_resources/assets/forestry/textures/gui/fabricator.png b/src/main/resources/assets/forestry/textures/gui/fabricator.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/fabricator.png rename to src/main/resources/assets/forestry/textures/gui/fabricator.png diff --git a/forestry_resources/assets/forestry/textures/gui/fermenter.png b/src/main/resources/assets/forestry/textures/gui/fermenter.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/fermenter.png rename to src/main/resources/assets/forestry/textures/gui/fermenter.png diff --git a/forestry_resources/assets/forestry/textures/gui/generator.png b/src/main/resources/assets/forestry/textures/gui/generator.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/generator.png rename to src/main/resources/assets/forestry/textures/gui/generator.png diff --git a/forestry_resources/assets/forestry/textures/gui/hygroregulator.png b/src/main/resources/assets/forestry/textures/gui/hygroregulator.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/hygroregulator.png rename to src/main/resources/assets/forestry/textures/gui/hygroregulator.png diff --git a/forestry_resources/assets/forestry/textures/gui/imprinter.png b/src/main/resources/assets/forestry/textures/gui/imprinter.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/imprinter.png rename to src/main/resources/assets/forestry/textures/gui/imprinter.png diff --git a/forestry_resources/assets/forestry/textures/gui/infuser.png b/src/main/resources/assets/forestry/textures/gui/infuser.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/infuser.png rename to src/main/resources/assets/forestry/textures/gui/infuser.png diff --git a/forestry_resources/assets/forestry/textures/gui/ledger.png b/src/main/resources/assets/forestry/textures/gui/ledger.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/ledger.png rename to src/main/resources/assets/forestry/textures/gui/ledger.png diff --git a/forestry_resources/assets/forestry/textures/gui/letter.png b/src/main/resources/assets/forestry/textures/gui/letter.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/letter.png rename to src/main/resources/assets/forestry/textures/gui/letter.png diff --git a/forestry_resources/assets/forestry/textures/gui/mailalert.png b/src/main/resources/assets/forestry/textures/gui/mailalert.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/mailalert.png rename to src/main/resources/assets/forestry/textures/gui/mailalert.png diff --git a/forestry_resources/assets/forestry/textures/gui/mailbox.png b/src/main/resources/assets/forestry/textures/gui/mailbox.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/mailbox.png rename to src/main/resources/assets/forestry/textures/gui/mailbox.png diff --git a/forestry_resources/assets/forestry/textures/gui/mailtrader.png b/src/main/resources/assets/forestry/textures/gui/mailtrader.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/mailtrader.png rename to src/main/resources/assets/forestry/textures/gui/mailtrader.png diff --git a/forestry_resources/assets/forestry/textures/gui/mfarm.png b/src/main/resources/assets/forestry/textures/gui/mfarm.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/mfarm.png rename to src/main/resources/assets/forestry/textures/gui/mfarm.png diff --git a/forestry_resources/assets/forestry/textures/gui/moistener.png b/src/main/resources/assets/forestry/textures/gui/moistener.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/moistener.png rename to src/main/resources/assets/forestry/textures/gui/moistener.png diff --git a/forestry_resources/assets/forestry/textures/gui/peatengine.png b/src/main/resources/assets/forestry/textures/gui/peatengine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/peatengine.png rename to src/main/resources/assets/forestry/textures/gui/peatengine.png diff --git a/forestry_resources/assets/forestry/textures/gui/philatelist.png b/src/main/resources/assets/forestry/textures/gui/philatelist.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/philatelist.png rename to src/main/resources/assets/forestry/textures/gui/philatelist.png diff --git a/forestry_resources/assets/forestry/textures/gui/raintank.png b/src/main/resources/assets/forestry/textures/gui/raintank.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/raintank.png rename to src/main/resources/assets/forestry/textures/gui/raintank.png diff --git a/forestry_resources/assets/forestry/textures/gui/sieve.png b/src/main/resources/assets/forestry/textures/gui/sieve.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/sieve.png rename to src/main/resources/assets/forestry/textures/gui/sieve.png diff --git a/forestry_resources/assets/forestry/textures/gui/solder.png b/src/main/resources/assets/forestry/textures/gui/solder.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/solder.png rename to src/main/resources/assets/forestry/textures/gui/solder.png diff --git a/forestry_resources/assets/forestry/textures/gui/squeezer.png b/src/main/resources/assets/forestry/textures/gui/squeezer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/squeezer.png rename to src/main/resources/assets/forestry/textures/gui/squeezer.png diff --git a/forestry_resources/assets/forestry/textures/gui/still.png b/src/main/resources/assets/forestry/textures/gui/still.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/still.png rename to src/main/resources/assets/forestry/textures/gui/still.png diff --git a/forestry_resources/assets/forestry/textures/gui/swarmer.png b/src/main/resources/assets/forestry/textures/gui/swarmer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/swarmer.png rename to src/main/resources/assets/forestry/textures/gui/swarmer.png diff --git a/forestry_resources/assets/forestry/textures/gui/tradername.png b/src/main/resources/assets/forestry/textures/gui/tradername.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/tradername.png rename to src/main/resources/assets/forestry/textures/gui/tradername.png diff --git a/forestry_resources/assets/forestry/textures/gui/worktable.png b/src/main/resources/assets/forestry/textures/gui/worktable.png similarity index 100% rename from forestry_resources/assets/forestry/textures/gui/worktable.png rename to src/main/resources/assets/forestry/textures/gui/worktable.png diff --git a/forestry_resources/assets/forestry/textures/items/ambrosia.png b/src/main/resources/assets/forestry/textures/items/ambrosia.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/ambrosia.png rename to src/main/resources/assets/forestry/textures/items/ambrosia.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/anything.png b/src/main/resources/assets/forestry/textures/items/analyzer/anything.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/anything.png rename to src/main/resources/assets/forestry/textures/items/analyzer/anything.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/bee.png b/src/main/resources/assets/forestry/textures/items/analyzer/bee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/bee.png rename to src/main/resources/assets/forestry/textures/items/analyzer/bee.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/cave.png b/src/main/resources/assets/forestry/textures/items/analyzer/cave.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/cave.png rename to src/main/resources/assets/forestry/textures/items/analyzer/cave.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/closed.png b/src/main/resources/assets/forestry/textures/items/analyzer/closed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/closed.png rename to src/main/resources/assets/forestry/textures/items/analyzer/closed.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/drone.png b/src/main/resources/assets/forestry/textures/items/analyzer/drone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/drone.png rename to src/main/resources/assets/forestry/textures/items/analyzer/drone.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/flyer.png b/src/main/resources/assets/forestry/textures/items/analyzer/flyer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/flyer.png rename to src/main/resources/assets/forestry/textures/items/analyzer/flyer.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/item.png b/src/main/resources/assets/forestry/textures/items/analyzer/item.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/item.png rename to src/main/resources/assets/forestry/textures/items/analyzer/item.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/nocturnal.png b/src/main/resources/assets/forestry/textures/items/analyzer/nocturnal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/nocturnal.png rename to src/main/resources/assets/forestry/textures/items/analyzer/nocturnal.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/princess.png b/src/main/resources/assets/forestry/textures/items/analyzer/princess.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/princess.png rename to src/main/resources/assets/forestry/textures/items/analyzer/princess.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/pure_breed.png b/src/main/resources/assets/forestry/textures/items/analyzer/pure_breed.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/pure_breed.png rename to src/main/resources/assets/forestry/textures/items/analyzer/pure_breed.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/pure_cave.png b/src/main/resources/assets/forestry/textures/items/analyzer/pure_cave.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/pure_cave.png rename to src/main/resources/assets/forestry/textures/items/analyzer/pure_cave.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/pure_flyer.png b/src/main/resources/assets/forestry/textures/items/analyzer/pure_flyer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/pure_flyer.png rename to src/main/resources/assets/forestry/textures/items/analyzer/pure_flyer.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/pure_nocturnal.png b/src/main/resources/assets/forestry/textures/items/analyzer/pure_nocturnal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/pure_nocturnal.png rename to src/main/resources/assets/forestry/textures/items/analyzer/pure_nocturnal.png diff --git a/forestry_resources/assets/forestry/textures/items/analyzer/queen.png b/src/main/resources/assets/forestry/textures/items/analyzer/queen.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/analyzer/queen.png rename to src/main/resources/assets/forestry/textures/items/analyzer/queen.png diff --git a/forestry_resources/assets/forestry/textures/items/apatite.png b/src/main/resources/assets/forestry/textures/items/apatite.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apatite.png rename to src/main/resources/assets/forestry/textures/items/apatite.png diff --git a/forestry_resources/assets/forestry/textures/items/apiaristBoots.png b/src/main/resources/assets/forestry/textures/items/apiaristBoots.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apiaristBoots.png rename to src/main/resources/assets/forestry/textures/items/apiaristBoots.png diff --git a/forestry_resources/assets/forestry/textures/items/apiaristChest.png b/src/main/resources/assets/forestry/textures/items/apiaristChest.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apiaristChest.png rename to src/main/resources/assets/forestry/textures/items/apiaristChest.png diff --git a/forestry_resources/assets/forestry/textures/items/apiaristHelmet.png b/src/main/resources/assets/forestry/textures/items/apiaristHelmet.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apiaristHelmet.png rename to src/main/resources/assets/forestry/textures/items/apiaristHelmet.png diff --git a/forestry_resources/assets/forestry/textures/items/apiaristLegs.png b/src/main/resources/assets/forestry/textures/items/apiaristLegs.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apiaristLegs.png rename to src/main/resources/assets/forestry/textures/items/apiaristLegs.png diff --git a/forestry_resources/assets/forestry/textures/items/apiarist_armor_1.png b/src/main/resources/assets/forestry/textures/items/apiarist_armor_1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apiarist_armor_1.png rename to src/main/resources/assets/forestry/textures/items/apiarist_armor_1.png diff --git a/forestry_resources/assets/forestry/textures/items/apiarist_armor_2.png b/src/main/resources/assets/forestry/textures/items/apiarist_armor_2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/apiarist_armor_2.png rename to src/main/resources/assets/forestry/textures/items/apiarist_armor_2.png diff --git a/forestry_resources/assets/forestry/textures/items/ash.png b/src/main/resources/assets/forestry/textures/items/ash.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/ash.png rename to src/main/resources/assets/forestry/textures/items/ash.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/locked.png b/src/main/resources/assets/forestry/textures/items/backpacks/locked.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/locked.png rename to src/main/resources/assets/forestry/textures/items/backpacks/locked.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/neutral.png b/src/main/resources/assets/forestry/textures/items/backpacks/neutral.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/neutral.png rename to src/main/resources/assets/forestry/textures/items/backpacks/neutral.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/receive.png b/src/main/resources/assets/forestry/textures/items/backpacks/receive.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/receive.png rename to src/main/resources/assets/forestry/textures/items/backpacks/receive.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/resupply.png b/src/main/resources/assets/forestry/textures/items/backpacks/resupply.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/resupply.png rename to src/main/resources/assets/forestry/textures/items/backpacks/resupply.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/t1.cloth.png b/src/main/resources/assets/forestry/textures/items/backpacks/t1.cloth.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/t1.cloth.png rename to src/main/resources/assets/forestry/textures/items/backpacks/t1.cloth.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/t1.outline.png b/src/main/resources/assets/forestry/textures/items/backpacks/t1.outline.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/t1.outline.png rename to src/main/resources/assets/forestry/textures/items/backpacks/t1.outline.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/t2.cloth.png b/src/main/resources/assets/forestry/textures/items/backpacks/t2.cloth.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/t2.cloth.png rename to src/main/resources/assets/forestry/textures/items/backpacks/t2.cloth.png diff --git a/forestry_resources/assets/forestry/textures/items/backpacks/t2.outline.png b/src/main/resources/assets/forestry/textures/items/backpacks/t2.outline.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/backpacks/t2.outline.png rename to src/main/resources/assets/forestry/textures/items/backpacks/t2.outline.png diff --git a/forestry_resources/assets/forestry/textures/items/beeCombs.0.png b/src/main/resources/assets/forestry/textures/items/beeCombs.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/beeCombs.0.png rename to src/main/resources/assets/forestry/textures/items/beeCombs.0.png diff --git a/forestry_resources/assets/forestry/textures/items/beeCombs.1.png b/src/main/resources/assets/forestry/textures/items/beeCombs.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/beeCombs.1.png rename to src/main/resources/assets/forestry/textures/items/beeCombs.1.png diff --git a/forestry_resources/assets/forestry/textures/items/beealyzer.png b/src/main/resources/assets/forestry/textures/items/beealyzer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/beealyzer.png rename to src/main/resources/assets/forestry/textures/items/beealyzer.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/body1.png b/src/main/resources/assets/forestry/textures/items/bees/default/body1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/body1.png rename to src/main/resources/assets/forestry/textures/items/bees/default/body1.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/drone.body2.png b/src/main/resources/assets/forestry/textures/items/bees/default/drone.body2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/drone.body2.png rename to src/main/resources/assets/forestry/textures/items/bees/default/drone.body2.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/drone.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/drone.body2.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/drone.body2.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/drone.body2.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/drone.body2.txt b/src/main/resources/assets/forestry/textures/items/bees/default/drone.body2.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/drone.body2.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/drone.body2.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/drone.outline.png b/src/main/resources/assets/forestry/textures/items/bees/default/drone.outline.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/drone.outline.png rename to src/main/resources/assets/forestry/textures/items/bees/default/drone.outline.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/drone.outline.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/drone.outline.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/drone.outline.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/drone.outline.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/drone.outline.txt b/src/main/resources/assets/forestry/textures/items/bees/default/drone.outline.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/drone.outline.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/drone.outline.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.body.png b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.body.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.body.png rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.body.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.body.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.body.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.body.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.body.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.body.txt b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.body.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.body.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.body.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.body2.png b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.body2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.body2.png rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.body2.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.body2.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.body2.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.body2.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.body2.txt b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.body2.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.body2.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.body2.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.outline.png b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.outline.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.outline.png rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.outline.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.outline.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.outline.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.outline.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.outline.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/larvae.outline.txt b/src/main/resources/assets/forestry/textures/items/bees/default/larvae.outline.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/larvae.outline.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/larvae.outline.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/princess.body2.png b/src/main/resources/assets/forestry/textures/items/bees/default/princess.body2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/princess.body2.png rename to src/main/resources/assets/forestry/textures/items/bees/default/princess.body2.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/princess.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/princess.body2.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/princess.body2.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/princess.body2.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/princess.body2.txt b/src/main/resources/assets/forestry/textures/items/bees/default/princess.body2.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/princess.body2.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/princess.body2.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/princess.outline.png b/src/main/resources/assets/forestry/textures/items/bees/default/princess.outline.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/princess.outline.png rename to src/main/resources/assets/forestry/textures/items/bees/default/princess.outline.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/princess.outline.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/princess.outline.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/princess.outline.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/princess.outline.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/princess.outline.txt b/src/main/resources/assets/forestry/textures/items/bees/default/princess.outline.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/princess.outline.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/princess.outline.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/queen.body2.png b/src/main/resources/assets/forestry/textures/items/bees/default/queen.body2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/queen.body2.png rename to src/main/resources/assets/forestry/textures/items/bees/default/queen.body2.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/queen.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/queen.body2.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/queen.body2.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/queen.body2.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/queen.body2.txt b/src/main/resources/assets/forestry/textures/items/bees/default/queen.body2.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/queen.body2.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/queen.body2.txt diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/queen.outline.png b/src/main/resources/assets/forestry/textures/items/bees/default/queen.outline.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/queen.outline.png rename to src/main/resources/assets/forestry/textures/items/bees/default/queen.outline.png diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/queen.outline.png.mcmeta b/src/main/resources/assets/forestry/textures/items/bees/default/queen.outline.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/queen.outline.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/bees/default/queen.outline.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bees/default/queen.outline.txt b/src/main/resources/assets/forestry/textures/items/bees/default/queen.outline.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bees/default/queen.outline.txt rename to src/main/resources/assets/forestry/textures/items/bees/default/queen.outline.txt diff --git a/forestry_resources/assets/forestry/textures/items/beeswax.png b/src/main/resources/assets/forestry/textures/items/beeswax.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/beeswax.png rename to src/main/resources/assets/forestry/textures/items/beeswax.png diff --git a/forestry_resources/assets/forestry/textures/items/bioMass.png b/src/main/resources/assets/forestry/textures/items/bioMass.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bioMass.png rename to src/main/resources/assets/forestry/textures/items/bioMass.png diff --git a/forestry_resources/assets/forestry/textures/items/biomefinder.mcmeta b/src/main/resources/assets/forestry/textures/items/biomefinder.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/biomefinder.mcmeta rename to src/main/resources/assets/forestry/textures/items/biomefinder.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/biomefinder.png b/src/main/resources/assets/forestry/textures/items/biomefinder.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/biomefinder.png rename to src/main/resources/assets/forestry/textures/items/biomefinder.png diff --git a/forestry_resources/assets/forestry/textures/items/biomefinder.png.mcmeta b/src/main/resources/assets/forestry/textures/items/biomefinder.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/biomefinder.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/biomefinder.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/biomefinder.txt b/src/main/resources/assets/forestry/textures/items/biomefinder.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/biomefinder.txt rename to src/main/resources/assets/forestry/textures/items/biomefinder.txt diff --git a/forestry_resources/assets/forestry/textures/items/biomefinder.txt.mcmeta b/src/main/resources/assets/forestry/textures/items/biomefinder.txt.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/biomefinder.txt.mcmeta rename to src/main/resources/assets/forestry/textures/items/biomefinder.txt.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/bituminousPeat.png b/src/main/resources/assets/forestry/textures/items/bituminousPeat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bituminousPeat.png rename to src/main/resources/assets/forestry/textures/items/bituminousPeat.png diff --git a/forestry_resources/assets/forestry/textures/items/brokenBronzePickaxe.png b/src/main/resources/assets/forestry/textures/items/brokenBronzePickaxe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/brokenBronzePickaxe.png rename to src/main/resources/assets/forestry/textures/items/brokenBronzePickaxe.png diff --git a/forestry_resources/assets/forestry/textures/items/brokenBronzeShovel.png b/src/main/resources/assets/forestry/textures/items/brokenBronzeShovel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/brokenBronzeShovel.png rename to src/main/resources/assets/forestry/textures/items/brokenBronzeShovel.png diff --git a/forestry_resources/assets/forestry/textures/items/bronzePickaxe.png b/src/main/resources/assets/forestry/textures/items/bronzePickaxe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bronzePickaxe.png rename to src/main/resources/assets/forestry/textures/items/bronzePickaxe.png diff --git a/forestry_resources/assets/forestry/textures/items/bronzeShovel.png b/src/main/resources/assets/forestry/textures/items/bronzeShovel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bronzeShovel.png rename to src/main/resources/assets/forestry/textures/items/bronzeShovel.png diff --git a/forestry_resources/assets/forestry/textures/items/bucketBiofuel.png b/src/main/resources/assets/forestry/textures/items/bucketBiofuel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bucketBiofuel.png rename to src/main/resources/assets/forestry/textures/items/bucketBiofuel.png diff --git a/forestry_resources/assets/forestry/textures/items/bucketBiomass.png b/src/main/resources/assets/forestry/textures/items/bucketBiomass.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/bucketBiomass.png rename to src/main/resources/assets/forestry/textures/items/bucketBiomass.png diff --git a/forestry_resources/assets/forestry/textures/items/carton.png b/src/main/resources/assets/forestry/textures/items/carton.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/carton.png rename to src/main/resources/assets/forestry/textures/items/carton.png diff --git a/forestry_resources/assets/forestry/textures/items/catalogue.png b/src/main/resources/assets/forestry/textures/items/catalogue.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/catalogue.png rename to src/main/resources/assets/forestry/textures/items/catalogue.png diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body.mcmeta b/src/main/resources/assets/forestry/textures/items/caterpillar.body.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body.mcmeta rename to src/main/resources/assets/forestry/textures/items/caterpillar.body.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body.png b/src/main/resources/assets/forestry/textures/items/caterpillar.body.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body.png rename to src/main/resources/assets/forestry/textures/items/caterpillar.body.png diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body.png.mcmeta b/src/main/resources/assets/forestry/textures/items/caterpillar.body.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/caterpillar.body.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body.txt b/src/main/resources/assets/forestry/textures/items/caterpillar.body.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body.txt rename to src/main/resources/assets/forestry/textures/items/caterpillar.body.txt diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body.txt.mcmeta b/src/main/resources/assets/forestry/textures/items/caterpillar.body.txt.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body.txt.mcmeta rename to src/main/resources/assets/forestry/textures/items/caterpillar.body.txt.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body2.mcmeta b/src/main/resources/assets/forestry/textures/items/caterpillar.body2.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body2.mcmeta rename to src/main/resources/assets/forestry/textures/items/caterpillar.body2.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body2.png b/src/main/resources/assets/forestry/textures/items/caterpillar.body2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body2.png rename to src/main/resources/assets/forestry/textures/items/caterpillar.body2.png diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body2.png.mcmeta b/src/main/resources/assets/forestry/textures/items/caterpillar.body2.png.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body2.png.mcmeta rename to src/main/resources/assets/forestry/textures/items/caterpillar.body2.png.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body2.txt b/src/main/resources/assets/forestry/textures/items/caterpillar.body2.txt similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body2.txt rename to src/main/resources/assets/forestry/textures/items/caterpillar.body2.txt diff --git a/forestry_resources/assets/forestry/textures/items/caterpillar.body2.txt.mcmeta b/src/main/resources/assets/forestry/textures/items/caterpillar.body2.txt.mcmeta similarity index 100% rename from forestry_resources/assets/forestry/textures/items/caterpillar.body2.txt.mcmeta rename to src/main/resources/assets/forestry/textures/items/caterpillar.body2.txt.mcmeta diff --git a/forestry_resources/assets/forestry/textures/items/chipsets.0.png b/src/main/resources/assets/forestry/textures/items/chipsets.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/chipsets.0.png rename to src/main/resources/assets/forestry/textures/items/chipsets.0.png diff --git a/forestry_resources/assets/forestry/textures/items/chipsets.1.png b/src/main/resources/assets/forestry/textures/items/chipsets.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/chipsets.1.png rename to src/main/resources/assets/forestry/textures/items/chipsets.1.png diff --git a/forestry_resources/assets/forestry/textures/items/crate.png b/src/main/resources/assets/forestry/textures/items/crate.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crate.png rename to src/main/resources/assets/forestry/textures/items/crate.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/apatite.png b/src/main/resources/assets/forestry/textures/items/crates/apatite.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/apatite.png rename to src/main/resources/assets/forestry/textures/items/crates/apatite.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/apples.png b/src/main/resources/assets/forestry/textures/items/crates/apples.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/apples.png rename to src/main/resources/assets/forestry/textures/items/crates/apples.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/ash.png b/src/main/resources/assets/forestry/textures/items/crates/ash.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/ash.png rename to src/main/resources/assets/forestry/textures/items/crates/ash.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/beeswax.png b/src/main/resources/assets/forestry/textures/items/crates/beeswax.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/beeswax.png rename to src/main/resources/assets/forestry/textures/items/crates/beeswax.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/bogearth.png b/src/main/resources/assets/forestry/textures/items/crates/bogearth.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/bogearth.png rename to src/main/resources/assets/forestry/textures/items/crates/bogearth.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/brass.png b/src/main/resources/assets/forestry/textures/items/crates/brass.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/brass.png rename to src/main/resources/assets/forestry/textures/items/crates/brass.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/brick.png b/src/main/resources/assets/forestry/textures/items/crates/brick.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/brick.png rename to src/main/resources/assets/forestry/textures/items/crates/brick.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/bronze.png b/src/main/resources/assets/forestry/textures/items/crates/bronze.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/bronze.png rename to src/main/resources/assets/forestry/textures/items/crates/bronze.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/cacti.png b/src/main/resources/assets/forestry/textures/items/crates/cacti.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/cacti.png rename to src/main/resources/assets/forestry/textures/items/crates/cacti.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/charcoal.png b/src/main/resources/assets/forestry/textures/items/crates/charcoal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/charcoal.png rename to src/main/resources/assets/forestry/textures/items/crates/charcoal.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/clay.png b/src/main/resources/assets/forestry/textures/items/crates/clay.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/clay.png rename to src/main/resources/assets/forestry/textures/items/crates/clay.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/coal.png b/src/main/resources/assets/forestry/textures/items/crates/coal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/coal.png rename to src/main/resources/assets/forestry/textures/items/crates/coal.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/cobblestone.png b/src/main/resources/assets/forestry/textures/items/crates/cobblestone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/cobblestone.png rename to src/main/resources/assets/forestry/textures/items/crates/cobblestone.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/cocoacomb.png b/src/main/resources/assets/forestry/textures/items/crates/cocoacomb.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/cocoacomb.png rename to src/main/resources/assets/forestry/textures/items/crates/cocoacomb.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/cookies.png b/src/main/resources/assets/forestry/textures/items/crates/cookies.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/cookies.png rename to src/main/resources/assets/forestry/textures/items/crates/cookies.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/copper.png b/src/main/resources/assets/forestry/textures/items/crates/copper.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/copper.png rename to src/main/resources/assets/forestry/textures/items/crates/copper.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/dirt.png b/src/main/resources/assets/forestry/textures/items/crates/dirt.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/dirt.png rename to src/main/resources/assets/forestry/textures/items/crates/dirt.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/drippingcombs.png b/src/main/resources/assets/forestry/textures/items/crates/drippingcombs.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/drippingcombs.png rename to src/main/resources/assets/forestry/textures/items/crates/drippingcombs.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/fertilizer.png b/src/main/resources/assets/forestry/textures/items/crates/fertilizer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/fertilizer.png rename to src/main/resources/assets/forestry/textures/items/crates/fertilizer.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/frozencombs.png b/src/main/resources/assets/forestry/textures/items/crates/frozencombs.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/frozencombs.png rename to src/main/resources/assets/forestry/textures/items/crates/frozencombs.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/glowstone.png b/src/main/resources/assets/forestry/textures/items/crates/glowstone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/glowstone.png rename to src/main/resources/assets/forestry/textures/items/crates/glowstone.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/gravel.png b/src/main/resources/assets/forestry/textures/items/crates/gravel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/gravel.png rename to src/main/resources/assets/forestry/textures/items/crates/gravel.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/honeycombs.png b/src/main/resources/assets/forestry/textures/items/crates/honeycombs.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/honeycombs.png rename to src/main/resources/assets/forestry/textures/items/crates/honeycombs.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/honeydew.png b/src/main/resources/assets/forestry/textures/items/crates/honeydew.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/honeydew.png rename to src/main/resources/assets/forestry/textures/items/crates/honeydew.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/honeydrop.png b/src/main/resources/assets/forestry/textures/items/crates/honeydrop.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/honeydrop.png rename to src/main/resources/assets/forestry/textures/items/crates/honeydrop.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/humus.png b/src/main/resources/assets/forestry/textures/items/crates/humus.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/humus.png rename to src/main/resources/assets/forestry/textures/items/crates/humus.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/iron.png b/src/main/resources/assets/forestry/textures/items/crates/iron.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/iron.png rename to src/main/resources/assets/forestry/textures/items/crates/iron.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/lapis.png b/src/main/resources/assets/forestry/textures/items/crates/lapis.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/lapis.png rename to src/main/resources/assets/forestry/textures/items/crates/lapis.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/mulch.png b/src/main/resources/assets/forestry/textures/items/crates/mulch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/mulch.png rename to src/main/resources/assets/forestry/textures/items/crates/mulch.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/mycelium.png b/src/main/resources/assets/forestry/textures/items/crates/mycelium.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/mycelium.png rename to src/main/resources/assets/forestry/textures/items/crates/mycelium.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/netherbrick.png b/src/main/resources/assets/forestry/textures/items/crates/netherbrick.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/netherbrick.png rename to src/main/resources/assets/forestry/textures/items/crates/netherbrick.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/netherrack.png b/src/main/resources/assets/forestry/textures/items/crates/netherrack.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/netherrack.png rename to src/main/resources/assets/forestry/textures/items/crates/netherrack.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/netherwart.png b/src/main/resources/assets/forestry/textures/items/crates/netherwart.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/netherwart.png rename to src/main/resources/assets/forestry/textures/items/crates/netherwart.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/nikolite.png b/src/main/resources/assets/forestry/textures/items/crates/nikolite.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/nikolite.png rename to src/main/resources/assets/forestry/textures/items/crates/nikolite.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/obsidian.png b/src/main/resources/assets/forestry/textures/items/crates/obsidian.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/obsidian.png rename to src/main/resources/assets/forestry/textures/items/crates/obsidian.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/peat.png b/src/main/resources/assets/forestry/textures/items/crates/peat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/peat.png rename to src/main/resources/assets/forestry/textures/items/crates/peat.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/phosphor.png b/src/main/resources/assets/forestry/textures/items/crates/phosphor.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/phosphor.png rename to src/main/resources/assets/forestry/textures/items/crates/phosphor.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/pollen.png b/src/main/resources/assets/forestry/textures/items/crates/pollen.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/pollen.png rename to src/main/resources/assets/forestry/textures/items/crates/pollen.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/propolis.png b/src/main/resources/assets/forestry/textures/items/crates/propolis.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/propolis.png rename to src/main/resources/assets/forestry/textures/items/crates/propolis.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/redstone.png b/src/main/resources/assets/forestry/textures/items/crates/redstone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/redstone.png rename to src/main/resources/assets/forestry/textures/items/crates/redstone.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/reeds.png b/src/main/resources/assets/forestry/textures/items/crates/reeds.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/reeds.png rename to src/main/resources/assets/forestry/textures/items/crates/reeds.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/refractorywax.png b/src/main/resources/assets/forestry/textures/items/crates/refractorywax.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/refractorywax.png rename to src/main/resources/assets/forestry/textures/items/crates/refractorywax.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/resin.png b/src/main/resources/assets/forestry/textures/items/crates/resin.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/resin.png rename to src/main/resources/assets/forestry/textures/items/crates/resin.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/rubber.png b/src/main/resources/assets/forestry/textures/items/crates/rubber.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/rubber.png rename to src/main/resources/assets/forestry/textures/items/crates/rubber.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/sand.png b/src/main/resources/assets/forestry/textures/items/crates/sand.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/sand.png rename to src/main/resources/assets/forestry/textures/items/crates/sand.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/sandstone.png b/src/main/resources/assets/forestry/textures/items/crates/sandstone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/sandstone.png rename to src/main/resources/assets/forestry/textures/items/crates/sandstone.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/saplings.png b/src/main/resources/assets/forestry/textures/items/crates/saplings.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/saplings.png rename to src/main/resources/assets/forestry/textures/items/crates/saplings.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/scrap.png b/src/main/resources/assets/forestry/textures/items/crates/scrap.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/scrap.png rename to src/main/resources/assets/forestry/textures/items/crates/scrap.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/seeds.png b/src/main/resources/assets/forestry/textures/items/crates/seeds.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/seeds.png rename to src/main/resources/assets/forestry/textures/items/crates/seeds.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/simmeringcombs.png b/src/main/resources/assets/forestry/textures/items/crates/simmeringcombs.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/simmeringcombs.png rename to src/main/resources/assets/forestry/textures/items/crates/simmeringcombs.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/soulsand.png b/src/main/resources/assets/forestry/textures/items/crates/soulsand.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/soulsand.png rename to src/main/resources/assets/forestry/textures/items/crates/soulsand.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/stone.png b/src/main/resources/assets/forestry/textures/items/crates/stone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/stone.png rename to src/main/resources/assets/forestry/textures/items/crates/stone.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/stringycombs.png b/src/main/resources/assets/forestry/textures/items/crates/stringycombs.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/stringycombs.png rename to src/main/resources/assets/forestry/textures/items/crates/stringycombs.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/tile]-16.png b/src/main/resources/assets/forestry/textures/items/crates/tile]-16.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/tile]-16.png rename to src/main/resources/assets/forestry/textures/items/crates/tile]-16.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/tin.png b/src/main/resources/assets/forestry/textures/items/crates/tin.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/tin.png rename to src/main/resources/assets/forestry/textures/items/crates/tin.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/uum.png b/src/main/resources/assets/forestry/textures/items/crates/uum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/uum.png rename to src/main/resources/assets/forestry/textures/items/crates/uum.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/wheat.png b/src/main/resources/assets/forestry/textures/items/crates/wheat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/wheat.png rename to src/main/resources/assets/forestry/textures/items/crates/wheat.png diff --git a/forestry_resources/assets/forestry/textures/items/crates/wood.png b/src/main/resources/assets/forestry/textures/items/crates/wood.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/crates/wood.png rename to src/main/resources/assets/forestry/textures/items/crates/wood.png diff --git a/forestry_resources/assets/forestry/textures/items/decayingWheat.png b/src/main/resources/assets/forestry/textures/items/decayingWheat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/decayingWheat.png rename to src/main/resources/assets/forestry/textures/items/decayingWheat.png diff --git a/forestry_resources/assets/forestry/textures/items/dissipationCharge.png b/src/main/resources/assets/forestry/textures/items/dissipationCharge.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/dissipationCharge.png rename to src/main/resources/assets/forestry/textures/items/dissipationCharge.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/circuitMismatch.png b/src/main/resources/assets/forestry/textures/items/errors/circuitMismatch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/circuitMismatch.png rename to src/main/resources/assets/forestry/textures/items/errors/circuitMismatch.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/errored.png b/src/main/resources/assets/forestry/textures/items/errors/errored.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/errored.png rename to src/main/resources/assets/forestry/textures/items/errors/errored.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/forcedCooldown.png b/src/main/resources/assets/forestry/textures/items/errors/forcedCooldown.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/forcedCooldown.png rename to src/main/resources/assets/forestry/textures/items/errors/forcedCooldown.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/invalidBiome.png b/src/main/resources/assets/forestry/textures/items/errors/invalidBiome.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/invalidBiome.png rename to src/main/resources/assets/forestry/textures/items/errors/invalidBiome.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/isRaining.png b/src/main/resources/assets/forestry/textures/items/errors/isRaining.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/isRaining.png rename to src/main/resources/assets/forestry/textures/items/errors/isRaining.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noCircuitBoard.png b/src/main/resources/assets/forestry/textures/items/errors/noCircuitBoard.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noCircuitBoard.png rename to src/main/resources/assets/forestry/textures/items/errors/noCircuitBoard.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noDisposal.png b/src/main/resources/assets/forestry/textures/items/errors/noDisposal.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noDisposal.png rename to src/main/resources/assets/forestry/textures/items/errors/noDisposal.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noDrone.png b/src/main/resources/assets/forestry/textures/items/errors/noDrone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noDrone.png rename to src/main/resources/assets/forestry/textures/items/errors/noDrone.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noEnergyNet.png b/src/main/resources/assets/forestry/textures/items/errors/noEnergyNet.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noEnergyNet.png rename to src/main/resources/assets/forestry/textures/items/errors/noEnergyNet.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noFarmland.png b/src/main/resources/assets/forestry/textures/items/errors/noFarmland.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noFarmland.png rename to src/main/resources/assets/forestry/textures/items/errors/noFarmland.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noFertilizer.png b/src/main/resources/assets/forestry/textures/items/errors/noFertilizer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noFertilizer.png rename to src/main/resources/assets/forestry/textures/items/errors/noFertilizer.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noFlower.png b/src/main/resources/assets/forestry/textures/items/errors/noFlower.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noFlower.png rename to src/main/resources/assets/forestry/textures/items/errors/noFlower.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noFuel.png b/src/main/resources/assets/forestry/textures/items/errors/noFuel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noFuel.png rename to src/main/resources/assets/forestry/textures/items/errors/noFuel.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noHeat.png b/src/main/resources/assets/forestry/textures/items/errors/noHeat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noHeat.png rename to src/main/resources/assets/forestry/textures/items/errors/noHeat.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noHoney.png b/src/main/resources/assets/forestry/textures/items/errors/noHoney.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noHoney.png rename to src/main/resources/assets/forestry/textures/items/errors/noHoney.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noLiquid.png b/src/main/resources/assets/forestry/textures/items/errors/noLiquid.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noLiquid.png rename to src/main/resources/assets/forestry/textures/items/errors/noLiquid.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noQueen.png b/src/main/resources/assets/forestry/textures/items/errors/noQueen.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noQueen.png rename to src/main/resources/assets/forestry/textures/items/errors/noQueen.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noRecipe.png b/src/main/resources/assets/forestry/textures/items/errors/noRecipe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noRecipe.png rename to src/main/resources/assets/forestry/textures/items/errors/noRecipe.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noRecipient.png b/src/main/resources/assets/forestry/textures/items/errors/noRecipient.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noRecipient.png rename to src/main/resources/assets/forestry/textures/items/errors/noRecipient.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noResource.png b/src/main/resources/assets/forestry/textures/items/errors/noResource.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noResource.png rename to src/main/resources/assets/forestry/textures/items/errors/noResource.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noSky.png b/src/main/resources/assets/forestry/textures/items/errors/noSky.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noSky.png rename to src/main/resources/assets/forestry/textures/items/errors/noSky.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noSpace.png b/src/main/resources/assets/forestry/textures/items/errors/noSpace.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noSpace.png rename to src/main/resources/assets/forestry/textures/items/errors/noSpace.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noSpecimen.png b/src/main/resources/assets/forestry/textures/items/errors/noSpecimen.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noSpecimen.png rename to src/main/resources/assets/forestry/textures/items/errors/noSpecimen.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/noStamps.png b/src/main/resources/assets/forestry/textures/items/errors/noStamps.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/noStamps.png rename to src/main/resources/assets/forestry/textures/items/errors/noStamps.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notAlphaNumeric.png b/src/main/resources/assets/forestry/textures/items/errors/notAlphaNumeric.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notAlphaNumeric.png rename to src/main/resources/assets/forestry/textures/items/errors/notAlphaNumeric.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notDay.png b/src/main/resources/assets/forestry/textures/items/errors/notDay.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notDay.png rename to src/main/resources/assets/forestry/textures/items/errors/notDay.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notGloomy.png b/src/main/resources/assets/forestry/textures/items/errors/notGloomy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notGloomy.png rename to src/main/resources/assets/forestry/textures/items/errors/notGloomy.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notLucid.png b/src/main/resources/assets/forestry/textures/items/errors/notLucid.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notLucid.png rename to src/main/resources/assets/forestry/textures/items/errors/notLucid.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notNight.png b/src/main/resources/assets/forestry/textures/items/errors/notNight.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notNight.png rename to src/main/resources/assets/forestry/textures/items/errors/notNight.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notPostpaid.png b/src/main/resources/assets/forestry/textures/items/errors/notPostpaid.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notPostpaid.png rename to src/main/resources/assets/forestry/textures/items/errors/notPostpaid.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notRaining.png b/src/main/resources/assets/forestry/textures/items/errors/notRaining.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notRaining.png rename to src/main/resources/assets/forestry/textures/items/errors/notRaining.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/notUnique.png b/src/main/resources/assets/forestry/textures/items/errors/notUnique.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/notUnique.png rename to src/main/resources/assets/forestry/textures/items/errors/notUnique.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/ok.png b/src/main/resources/assets/forestry/textures/items/errors/ok.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/ok.png rename to src/main/resources/assets/forestry/textures/items/errors/ok.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/unknown.png b/src/main/resources/assets/forestry/textures/items/errors/unknown.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/unknown.png rename to src/main/resources/assets/forestry/textures/items/errors/unknown.png diff --git a/forestry_resources/assets/forestry/textures/items/errors/wrongStacksize.png b/src/main/resources/assets/forestry/textures/items/errors/wrongStacksize.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/errors/wrongStacksize.png rename to src/main/resources/assets/forestry/textures/items/errors/wrongStacksize.png diff --git a/forestry_resources/assets/forestry/textures/items/fertilizerBio.png b/src/main/resources/assets/forestry/textures/items/fertilizerBio.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fertilizerBio.png rename to src/main/resources/assets/forestry/textures/items/fertilizerBio.png diff --git a/forestry_resources/assets/forestry/textures/items/fertilizerCompound.png b/src/main/resources/assets/forestry/textures/items/fertilizerCompound.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fertilizerCompound.png rename to src/main/resources/assets/forestry/textures/items/fertilizerCompound.png diff --git a/forestry_resources/assets/forestry/textures/items/flutterlyzer.png b/src/main/resources/assets/forestry/textures/items/flutterlyzer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/flutterlyzer.png rename to src/main/resources/assets/forestry/textures/items/flutterlyzer.png diff --git a/forestry_resources/assets/forestry/textures/items/frameImpregnated.png b/src/main/resources/assets/forestry/textures/items/frameImpregnated.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/frameImpregnated.png rename to src/main/resources/assets/forestry/textures/items/frameImpregnated.png diff --git a/forestry_resources/assets/forestry/textures/items/frameProven.png b/src/main/resources/assets/forestry/textures/items/frameProven.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/frameProven.png rename to src/main/resources/assets/forestry/textures/items/frameProven.png diff --git a/forestry_resources/assets/forestry/textures/items/frameUntreated.png b/src/main/resources/assets/forestry/textures/items/frameUntreated.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/frameUntreated.png rename to src/main/resources/assets/forestry/textures/items/frameUntreated.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/cherry.png b/src/main/resources/assets/forestry/textures/items/fruits/cherry.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/cherry.png rename to src/main/resources/assets/forestry/textures/items/fruits/cherry.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/chestnut.png b/src/main/resources/assets/forestry/textures/items/fruits/chestnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/chestnut.png rename to src/main/resources/assets/forestry/textures/items/fruits/chestnut.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/dates.png b/src/main/resources/assets/forestry/textures/items/fruits/dates.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/dates.png rename to src/main/resources/assets/forestry/textures/items/fruits/dates.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/lemon.png b/src/main/resources/assets/forestry/textures/items/fruits/lemon.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/lemon.png rename to src/main/resources/assets/forestry/textures/items/fruits/lemon.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/papaya.png b/src/main/resources/assets/forestry/textures/items/fruits/papaya.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/papaya.png rename to src/main/resources/assets/forestry/textures/items/fruits/papaya.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/plum.png b/src/main/resources/assets/forestry/textures/items/fruits/plum.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/plum.png rename to src/main/resources/assets/forestry/textures/items/fruits/plum.png diff --git a/forestry_resources/assets/forestry/textures/items/fruits/walnut.png b/src/main/resources/assets/forestry/textures/items/fruits/walnut.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/fruits/walnut.png rename to src/main/resources/assets/forestry/textures/items/fruits/walnut.png diff --git a/forestry_resources/assets/forestry/textures/items/gearBronze.png b/src/main/resources/assets/forestry/textures/items/gearBronze.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/gearBronze.png rename to src/main/resources/assets/forestry/textures/items/gearBronze.png diff --git a/forestry_resources/assets/forestry/textures/items/gearCopper.png b/src/main/resources/assets/forestry/textures/items/gearCopper.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/gearCopper.png rename to src/main/resources/assets/forestry/textures/items/gearCopper.png diff --git a/forestry_resources/assets/forestry/textures/items/gearTin.png b/src/main/resources/assets/forestry/textures/items/gearTin.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/gearTin.png rename to src/main/resources/assets/forestry/textures/items/gearTin.png diff --git a/forestry_resources/assets/forestry/textures/items/grafter.png b/src/main/resources/assets/forestry/textures/items/grafter.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/grafter.png rename to src/main/resources/assets/forestry/textures/items/grafter.png diff --git a/forestry_resources/assets/forestry/textures/items/grafterProven.png b/src/main/resources/assets/forestry/textures/items/grafterProven.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/grafterProven.png rename to src/main/resources/assets/forestry/textures/items/grafterProven.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/desert.png b/src/main/resources/assets/forestry/textures/items/habitats/desert.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/desert.png rename to src/main/resources/assets/forestry/textures/items/habitats/desert.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/end.png b/src/main/resources/assets/forestry/textures/items/habitats/end.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/end.png rename to src/main/resources/assets/forestry/textures/items/habitats/end.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/forest.png b/src/main/resources/assets/forestry/textures/items/habitats/forest.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/forest.png rename to src/main/resources/assets/forestry/textures/items/habitats/forest.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/hills.png b/src/main/resources/assets/forestry/textures/items/habitats/hills.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/hills.png rename to src/main/resources/assets/forestry/textures/items/habitats/hills.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/jungle.png b/src/main/resources/assets/forestry/textures/items/habitats/jungle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/jungle.png rename to src/main/resources/assets/forestry/textures/items/habitats/jungle.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/mushroom.png b/src/main/resources/assets/forestry/textures/items/habitats/mushroom.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/mushroom.png rename to src/main/resources/assets/forestry/textures/items/habitats/mushroom.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/nether.png b/src/main/resources/assets/forestry/textures/items/habitats/nether.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/nether.png rename to src/main/resources/assets/forestry/textures/items/habitats/nether.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/ocean.png b/src/main/resources/assets/forestry/textures/items/habitats/ocean.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/ocean.png rename to src/main/resources/assets/forestry/textures/items/habitats/ocean.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/plains.png b/src/main/resources/assets/forestry/textures/items/habitats/plains.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/plains.png rename to src/main/resources/assets/forestry/textures/items/habitats/plains.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/snow.png b/src/main/resources/assets/forestry/textures/items/habitats/snow.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/snow.png rename to src/main/resources/assets/forestry/textures/items/habitats/snow.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/swamp.png b/src/main/resources/assets/forestry/textures/items/habitats/swamp.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/swamp.png rename to src/main/resources/assets/forestry/textures/items/habitats/swamp.png diff --git a/forestry_resources/assets/forestry/textures/items/habitats/taiga.png b/src/main/resources/assets/forestry/textures/items/habitats/taiga.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/habitats/taiga.png rename to src/main/resources/assets/forestry/textures/items/habitats/taiga.png diff --git a/forestry_resources/assets/forestry/textures/items/hardenedMachine.png b/src/main/resources/assets/forestry/textures/items/hardenedMachine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/hardenedMachine.png rename to src/main/resources/assets/forestry/textures/items/hardenedMachine.png diff --git a/forestry_resources/assets/forestry/textures/items/honeyDrop.0.png b/src/main/resources/assets/forestry/textures/items/honeyDrop.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/honeyDrop.0.png rename to src/main/resources/assets/forestry/textures/items/honeyDrop.0.png diff --git a/forestry_resources/assets/forestry/textures/items/honeyDrop.1.png b/src/main/resources/assets/forestry/textures/items/honeyDrop.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/honeyDrop.1.png rename to src/main/resources/assets/forestry/textures/items/honeyDrop.1.png diff --git a/forestry_resources/assets/forestry/textures/items/honeyPot.png b/src/main/resources/assets/forestry/textures/items/honeyPot.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/honeyPot.png rename to src/main/resources/assets/forestry/textures/items/honeyPot.png diff --git a/forestry_resources/assets/forestry/textures/items/honeydew.png b/src/main/resources/assets/forestry/textures/items/honeydew.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/honeydew.png rename to src/main/resources/assets/forestry/textures/items/honeydew.png diff --git a/forestry_resources/assets/forestry/textures/items/honeyedSlice.png b/src/main/resources/assets/forestry/textures/items/honeyedSlice.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/honeyedSlice.png rename to src/main/resources/assets/forestry/textures/items/honeyedSlice.png diff --git a/forestry_resources/assets/forestry/textures/items/iceShard.png b/src/main/resources/assets/forestry/textures/items/iceShard.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/iceShard.png rename to src/main/resources/assets/forestry/textures/items/iceShard.png diff --git a/forestry_resources/assets/forestry/textures/items/impregnatedCasing.png b/src/main/resources/assets/forestry/textures/items/impregnatedCasing.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/impregnatedCasing.png rename to src/main/resources/assets/forestry/textures/items/impregnatedCasing.png diff --git a/forestry_resources/assets/forestry/textures/items/imprinter.png b/src/main/resources/assets/forestry/textures/items/imprinter.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/imprinter.png rename to src/main/resources/assets/forestry/textures/items/imprinter.png diff --git a/forestry_resources/assets/forestry/textures/items/infuser.png b/src/main/resources/assets/forestry/textures/items/infuser.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/infuser.png rename to src/main/resources/assets/forestry/textures/items/infuser.png diff --git a/forestry_resources/assets/forestry/textures/items/ingotBronze.png b/src/main/resources/assets/forestry/textures/items/ingotBronze.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/ingotBronze.png rename to src/main/resources/assets/forestry/textures/items/ingotBronze.png diff --git a/forestry_resources/assets/forestry/textures/items/ingotCopper.png b/src/main/resources/assets/forestry/textures/items/ingotCopper.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/ingotCopper.png rename to src/main/resources/assets/forestry/textures/items/ingotCopper.png diff --git a/forestry_resources/assets/forestry/textures/items/ingotTin.png b/src/main/resources/assets/forestry/textures/items/ingotTin.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/ingotTin.png rename to src/main/resources/assets/forestry/textures/items/ingotTin.png diff --git a/forestry_resources/assets/forestry/textures/items/iodineCapsule.png b/src/main/resources/assets/forestry/textures/items/iodineCapsule.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/iodineCapsule.png rename to src/main/resources/assets/forestry/textures/items/iodineCapsule.png diff --git a/forestry_resources/assets/forestry/textures/items/kitPickaxe.png b/src/main/resources/assets/forestry/textures/items/kitPickaxe.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/kitPickaxe.png rename to src/main/resources/assets/forestry/textures/items/kitPickaxe.png diff --git a/forestry_resources/assets/forestry/textures/items/kitShovel.png b/src/main/resources/assets/forestry/textures/items/kitShovel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/kitShovel.png rename to src/main/resources/assets/forestry/textures/items/kitShovel.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/bucket.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/bucket.bottle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/bucket.bottle.png rename to src/main/resources/assets/forestry/textures/items/liquids/bucket.bottle.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/bucket.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/bucket.contents.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/bucket.contents.png rename to src/main/resources/assets/forestry/textures/items/liquids/bucket.contents.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/can.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/can.bottle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/can.bottle.png rename to src/main/resources/assets/forestry/textures/items/liquids/can.bottle.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/can.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/can.contents.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/can.contents.png rename to src/main/resources/assets/forestry/textures/items/liquids/can.contents.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/capsule.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/capsule.bottle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/capsule.bottle.png rename to src/main/resources/assets/forestry/textures/items/liquids/capsule.bottle.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/capsule.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/capsule.contents.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/capsule.contents.png rename to src/main/resources/assets/forestry/textures/items/liquids/capsule.contents.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/glass.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/glass.bottle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/glass.bottle.png rename to src/main/resources/assets/forestry/textures/items/liquids/glass.bottle.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/glass.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/glass.contents.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/glass.contents.png rename to src/main/resources/assets/forestry/textures/items/liquids/glass.contents.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/jar.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/jar.bottle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/jar.bottle.png rename to src/main/resources/assets/forestry/textures/items/liquids/jar.bottle.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/jar.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/jar.contents.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/jar.contents.png rename to src/main/resources/assets/forestry/textures/items/liquids/jar.contents.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/refractory.bottle.png b/src/main/resources/assets/forestry/textures/items/liquids/refractory.bottle.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/refractory.bottle.png rename to src/main/resources/assets/forestry/textures/items/liquids/refractory.bottle.png diff --git a/forestry_resources/assets/forestry/textures/items/liquids/refractory.contents.png b/src/main/resources/assets/forestry/textures/items/liquids/refractory.contents.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/liquids/refractory.contents.png rename to src/main/resources/assets/forestry/textures/items/liquids/refractory.contents.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/carrier.player.png b/src/main/resources/assets/forestry/textures/items/mail/carrier.player.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/carrier.player.png rename to src/main/resources/assets/forestry/textures/items/mail/carrier.player.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/carrier.trader.png b/src/main/resources/assets/forestry/textures/items/mail/carrier.trader.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/carrier.trader.png rename to src/main/resources/assets/forestry/textures/items/mail/carrier.trader.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.0.emptied.png b/src/main/resources/assets/forestry/textures/items/mail/letter.0.emptied.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.0.emptied.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.0.emptied.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.0.fresh.png b/src/main/resources/assets/forestry/textures/items/mail/letter.0.fresh.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.0.fresh.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.0.fresh.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.0.opened.png b/src/main/resources/assets/forestry/textures/items/mail/letter.0.opened.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.0.opened.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.0.opened.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.0.stamped.png b/src/main/resources/assets/forestry/textures/items/mail/letter.0.stamped.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.0.stamped.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.0.stamped.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.1.emptied.png b/src/main/resources/assets/forestry/textures/items/mail/letter.1.emptied.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.1.emptied.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.1.emptied.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.1.fresh.png b/src/main/resources/assets/forestry/textures/items/mail/letter.1.fresh.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.1.fresh.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.1.fresh.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.1.opened.png b/src/main/resources/assets/forestry/textures/items/mail/letter.1.opened.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.1.opened.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.1.opened.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.1.stamped.png b/src/main/resources/assets/forestry/textures/items/mail/letter.1.stamped.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.1.stamped.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.1.stamped.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.2.emptied.png b/src/main/resources/assets/forestry/textures/items/mail/letter.2.emptied.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.2.emptied.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.2.emptied.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.2.fresh.png b/src/main/resources/assets/forestry/textures/items/mail/letter.2.fresh.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.2.fresh.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.2.fresh.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.2.opened.png b/src/main/resources/assets/forestry/textures/items/mail/letter.2.opened.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.2.opened.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.2.opened.png diff --git a/forestry_resources/assets/forestry/textures/items/mail/letter.2.stamped.png b/src/main/resources/assets/forestry/textures/items/mail/letter.2.stamped.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mail/letter.2.stamped.png rename to src/main/resources/assets/forestry/textures/items/mail/letter.2.stamped.png diff --git a/forestry_resources/assets/forestry/textures/items/misc/access.private.png b/src/main/resources/assets/forestry/textures/items/misc/access.private.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/misc/access.private.png rename to src/main/resources/assets/forestry/textures/items/misc/access.private.png diff --git a/forestry_resources/assets/forestry/textures/items/misc/access.shared.png b/src/main/resources/assets/forestry/textures/items/misc/access.shared.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/misc/access.shared.png rename to src/main/resources/assets/forestry/textures/items/misc/access.shared.png diff --git a/forestry_resources/assets/forestry/textures/items/misc/access.viewable.png b/src/main/resources/assets/forestry/textures/items/misc/access.viewable.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/misc/access.viewable.png rename to src/main/resources/assets/forestry/textures/items/misc/access.viewable.png diff --git a/forestry_resources/assets/forestry/textures/items/misc/energy.png b/src/main/resources/assets/forestry/textures/items/misc/energy.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/misc/energy.png rename to src/main/resources/assets/forestry/textures/items/misc/energy.png diff --git a/forestry_resources/assets/forestry/textures/items/misc/hint.png b/src/main/resources/assets/forestry/textures/items/misc/hint.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/misc/hint.png rename to src/main/resources/assets/forestry/textures/items/misc/hint.png diff --git a/forestry_resources/assets/forestry/textures/items/mouldyWheat.png b/src/main/resources/assets/forestry/textures/items/mouldyWheat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mouldyWheat.png rename to src/main/resources/assets/forestry/textures/items/mouldyWheat.png diff --git a/forestry_resources/assets/forestry/textures/items/mulch.png b/src/main/resources/assets/forestry/textures/items/mulch.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/mulch.png rename to src/main/resources/assets/forestry/textures/items/mulch.png diff --git a/forestry_resources/assets/forestry/textures/items/naturalistHelmet.png b/src/main/resources/assets/forestry/textures/items/naturalistHelmet.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/naturalistHelmet.png rename to src/main/resources/assets/forestry/textures/items/naturalistHelmet.png diff --git a/forestry_resources/assets/forestry/textures/items/naturalist_armor_1.png b/src/main/resources/assets/forestry/textures/items/naturalist_armor_1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/naturalist_armor_1.png rename to src/main/resources/assets/forestry/textures/items/naturalist_armor_1.png diff --git a/forestry_resources/assets/forestry/textures/items/oakStick.png b/src/main/resources/assets/forestry/textures/items/oakStick.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/oakStick.png rename to src/main/resources/assets/forestry/textures/items/oakStick.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/ember.png b/src/main/resources/assets/forestry/textures/items/particles/ember.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/ember.png rename to src/main/resources/assets/forestry/textures/items/particles/ember.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/flame.png b/src/main/resources/assets/forestry/textures/items/particles/flame.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/flame.png rename to src/main/resources/assets/forestry/textures/items/particles/flame.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/placeholder.png b/src/main/resources/assets/forestry/textures/items/particles/placeholder.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/placeholder.png rename to src/main/resources/assets/forestry/textures/items/particles/placeholder.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/poison.png b/src/main/resources/assets/forestry/textures/items/particles/poison.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/poison.png rename to src/main/resources/assets/forestry/textures/items/particles/poison.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/snow.1.png b/src/main/resources/assets/forestry/textures/items/particles/snow.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/snow.1.png rename to src/main/resources/assets/forestry/textures/items/particles/snow.1.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/snow.2.png b/src/main/resources/assets/forestry/textures/items/particles/snow.2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/snow.2.png rename to src/main/resources/assets/forestry/textures/items/particles/snow.2.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/snow.3.png b/src/main/resources/assets/forestry/textures/items/particles/snow.3.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/snow.3.png rename to src/main/resources/assets/forestry/textures/items/particles/snow.3.png diff --git a/forestry_resources/assets/forestry/textures/items/particles/swarm_bee.png b/src/main/resources/assets/forestry/textures/items/particles/swarm_bee.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/particles/swarm_bee.png rename to src/main/resources/assets/forestry/textures/items/particles/swarm_bee.png diff --git a/forestry_resources/assets/forestry/textures/items/peat.png b/src/main/resources/assets/forestry/textures/items/peat.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/peat.png rename to src/main/resources/assets/forestry/textures/items/peat.png diff --git a/forestry_resources/assets/forestry/textures/items/phosphor.png b/src/main/resources/assets/forestry/textures/items/phosphor.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/phosphor.png rename to src/main/resources/assets/forestry/textures/items/phosphor.png diff --git a/forestry_resources/assets/forestry/textures/items/pipette.0.png b/src/main/resources/assets/forestry/textures/items/pipette.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/pipette.0.png rename to src/main/resources/assets/forestry/textures/items/pipette.0.png diff --git a/forestry_resources/assets/forestry/textures/items/pipette.1.png b/src/main/resources/assets/forestry/textures/items/pipette.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/pipette.1.png rename to src/main/resources/assets/forestry/textures/items/pipette.1.png diff --git a/forestry_resources/assets/forestry/textures/items/pollen.0.png b/src/main/resources/assets/forestry/textures/items/pollen.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/pollen.0.png rename to src/main/resources/assets/forestry/textures/items/pollen.0.png diff --git a/forestry_resources/assets/forestry/textures/items/pollen.1.png b/src/main/resources/assets/forestry/textures/items/pollen.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/pollen.1.png rename to src/main/resources/assets/forestry/textures/items/pollen.1.png diff --git a/forestry_resources/assets/forestry/textures/items/propolis.0.png b/src/main/resources/assets/forestry/textures/items/propolis.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/propolis.0.png rename to src/main/resources/assets/forestry/textures/items/propolis.0.png diff --git a/forestry_resources/assets/forestry/textures/items/pulsatingDust.png b/src/main/resources/assets/forestry/textures/items/pulsatingDust.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/pulsatingDust.png rename to src/main/resources/assets/forestry/textures/items/pulsatingDust.png diff --git a/forestry_resources/assets/forestry/textures/items/pulsatingMesh.png b/src/main/resources/assets/forestry/textures/items/pulsatingMesh.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/pulsatingMesh.png rename to src/main/resources/assets/forestry/textures/items/pulsatingMesh.png diff --git a/forestry_resources/assets/forestry/textures/items/refractoryWax.png b/src/main/resources/assets/forestry/textures/items/refractoryWax.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/refractoryWax.png rename to src/main/resources/assets/forestry/textures/items/refractoryWax.png diff --git a/forestry_resources/assets/forestry/textures/items/royalJelly.png b/src/main/resources/assets/forestry/textures/items/royalJelly.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/royalJelly.png rename to src/main/resources/assets/forestry/textures/items/royalJelly.png diff --git a/forestry_resources/assets/forestry/textures/items/scentedPaneling.png b/src/main/resources/assets/forestry/textures/items/scentedPaneling.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/scentedPaneling.png rename to src/main/resources/assets/forestry/textures/items/scentedPaneling.png diff --git a/forestry_resources/assets/forestry/textures/items/scoop.png b/src/main/resources/assets/forestry/textures/items/scoop.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/scoop.png rename to src/main/resources/assets/forestry/textures/items/scoop.png diff --git a/forestry_resources/assets/forestry/textures/items/silkWisp.png b/src/main/resources/assets/forestry/textures/items/silkWisp.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/silkWisp.png rename to src/main/resources/assets/forestry/textures/items/silkWisp.png diff --git a/forestry_resources/assets/forestry/textures/items/slots/blocked.png b/src/main/resources/assets/forestry/textures/items/slots/blocked.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/slots/blocked.png rename to src/main/resources/assets/forestry/textures/items/slots/blocked.png diff --git a/forestry_resources/assets/forestry/textures/items/slots/blocked_2.png b/src/main/resources/assets/forestry/textures/items/slots/blocked_2.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/slots/blocked_2.png rename to src/main/resources/assets/forestry/textures/items/slots/blocked_2.png diff --git a/forestry_resources/assets/forestry/textures/items/slots/container.png b/src/main/resources/assets/forestry/textures/items/slots/container.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/slots/container.png rename to src/main/resources/assets/forestry/textures/items/slots/container.png diff --git a/forestry_resources/assets/forestry/textures/items/slots/liquid.png b/src/main/resources/assets/forestry/textures/items/slots/liquid.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/slots/liquid.png rename to src/main/resources/assets/forestry/textures/items/slots/liquid.png diff --git a/forestry_resources/assets/forestry/textures/items/slots/locked.png b/src/main/resources/assets/forestry/textures/items/slots/locked.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/slots/locked.png rename to src/main/resources/assets/forestry/textures/items/slots/locked.png diff --git a/forestry_resources/assets/forestry/textures/items/solderingIron.png b/src/main/resources/assets/forestry/textures/items/solderingIron.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/solderingIron.png rename to src/main/resources/assets/forestry/textures/items/solderingIron.png diff --git a/forestry_resources/assets/forestry/textures/items/spectacles.png b/src/main/resources/assets/forestry/textures/items/spectacles.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/spectacles.png rename to src/main/resources/assets/forestry/textures/items/spectacles.png diff --git a/forestry_resources/assets/forestry/textures/items/stamps.0.png b/src/main/resources/assets/forestry/textures/items/stamps.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/stamps.0.png rename to src/main/resources/assets/forestry/textures/items/stamps.0.png diff --git a/forestry_resources/assets/forestry/textures/items/stamps.1.png b/src/main/resources/assets/forestry/textures/items/stamps.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/stamps.1.png rename to src/main/resources/assets/forestry/textures/items/stamps.1.png diff --git a/forestry_resources/assets/forestry/textures/items/sturdyMachine.png b/src/main/resources/assets/forestry/textures/items/sturdyMachine.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/sturdyMachine.png rename to src/main/resources/assets/forestry/textures/items/sturdyMachine.png diff --git a/forestry_resources/assets/forestry/textures/items/thermionicTubes.0.png b/src/main/resources/assets/forestry/textures/items/thermionicTubes.0.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/thermionicTubes.0.png rename to src/main/resources/assets/forestry/textures/items/thermionicTubes.0.png diff --git a/forestry_resources/assets/forestry/textures/items/thermionicTubes.1.png b/src/main/resources/assets/forestry/textures/items/thermionicTubes.1.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/thermionicTubes.1.png rename to src/main/resources/assets/forestry/textures/items/thermionicTubes.1.png diff --git a/forestry_resources/assets/forestry/textures/items/treealyzer.png b/src/main/resources/assets/forestry/textures/items/treealyzer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/treealyzer.png rename to src/main/resources/assets/forestry/textures/items/treealyzer.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/hasMail.png b/src/main/resources/assets/forestry/textures/items/triggers/hasMail.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/hasMail.png rename to src/main/resources/assets/forestry/textures/items/triggers/hasMail.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/hasWork.png b/src/main/resources/assets/forestry/textures/items/triggers/hasWork.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/hasWork.png rename to src/main/resources/assets/forestry/textures/items/triggers/hasWork.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowFertilizer.png b/src/main/resources/assets/forestry/textures/items/triggers/lowFertilizer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowFertilizer.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowFertilizer.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowFuel.png b/src/main/resources/assets/forestry/textures/items/triggers/lowFuel.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowFuel.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowFuel.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowGermlings.png b/src/main/resources/assets/forestry/textures/items/triggers/lowGermlings.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowGermlings.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowGermlings.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowInput.png b/src/main/resources/assets/forestry/textures/items/triggers/lowInput.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowInput.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowInput.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowLiquid.png b/src/main/resources/assets/forestry/textures/items/triggers/lowLiquid.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowLiquid.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowLiquid.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowPaper.png b/src/main/resources/assets/forestry/textures/items/triggers/lowPaper.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowPaper.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowPaper.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowResources.png b/src/main/resources/assets/forestry/textures/items/triggers/lowResources.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowResources.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowResources.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowSoil.png b/src/main/resources/assets/forestry/textures/items/triggers/lowSoil.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowSoil.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowSoil.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/lowStamps.png b/src/main/resources/assets/forestry/textures/items/triggers/lowStamps.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/lowStamps.png rename to src/main/resources/assets/forestry/textures/items/triggers/lowStamps.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/mailBuffer.png b/src/main/resources/assets/forestry/textures/items/triggers/mailBuffer.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/mailBuffer.png rename to src/main/resources/assets/forestry/textures/items/triggers/mailBuffer.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/missingDrone.png b/src/main/resources/assets/forestry/textures/items/triggers/missingDrone.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/missingDrone.png rename to src/main/resources/assets/forestry/textures/items/triggers/missingDrone.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/missingQueen.png b/src/main/resources/assets/forestry/textures/items/triggers/missingQueen.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/missingQueen.png rename to src/main/resources/assets/forestry/textures/items/triggers/missingQueen.png diff --git a/forestry_resources/assets/forestry/textures/items/triggers/noFrames.png b/src/main/resources/assets/forestry/textures/items/triggers/noFrames.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/triggers/noFrames.png rename to src/main/resources/assets/forestry/textures/items/triggers/noFrames.png diff --git a/forestry_resources/assets/forestry/textures/items/vialCatalyst.png b/src/main/resources/assets/forestry/textures/items/vialCatalyst.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/vialCatalyst.png rename to src/main/resources/assets/forestry/textures/items/vialCatalyst.png diff --git a/forestry_resources/assets/forestry/textures/items/waxCast.png b/src/main/resources/assets/forestry/textures/items/waxCast.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/waxCast.png rename to src/main/resources/assets/forestry/textures/items/waxCast.png diff --git a/forestry_resources/assets/forestry/textures/items/woodPulp.png b/src/main/resources/assets/forestry/textures/items/woodPulp.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/woodPulp.png rename to src/main/resources/assets/forestry/textures/items/woodPulp.png diff --git a/forestry_resources/assets/forestry/textures/items/wovenSilk.png b/src/main/resources/assets/forestry/textures/items/wovenSilk.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/wovenSilk.png rename to src/main/resources/assets/forestry/textures/items/wovenSilk.png diff --git a/forestry_resources/assets/forestry/textures/items/wrench.png b/src/main/resources/assets/forestry/textures/items/wrench.png similarity index 100% rename from forestry_resources/assets/forestry/textures/items/wrench.png rename to src/main/resources/assets/forestry/textures/items/wrench.png diff --git a/forestry_resources/assets/forestry/textures/unsorted/tile]-10.png b/src/main/resources/assets/forestry/textures/unsorted/tile]-10.png similarity index 100% rename from forestry_resources/assets/forestry/textures/unsorted/tile]-10.png rename to src/main/resources/assets/forestry/textures/unsorted/tile]-10.png diff --git a/forestry_resources/assets/forestry/textures/unsorted/tile]-105.png b/src/main/resources/assets/forestry/textures/unsorted/tile]-105.png similarity index 100% rename from forestry_resources/assets/forestry/textures/unsorted/tile]-105.png rename to src/main/resources/assets/forestry/textures/unsorted/tile]-105.png diff --git a/forestry_resources/assets/forestry/textures/unsorted/tile]-37.png b/src/main/resources/assets/forestry/textures/unsorted/tile]-37.png similarity index 100% rename from forestry_resources/assets/forestry/textures/unsorted/tile]-37.png rename to src/main/resources/assets/forestry/textures/unsorted/tile]-37.png diff --git a/forestry_resources/assets/forestry/textures/unsorted/tile]-88.png b/src/main/resources/assets/forestry/textures/unsorted/tile]-88.png similarity index 100% rename from forestry_resources/assets/forestry/textures/unsorted/tile]-88.png rename to src/main/resources/assets/forestry/textures/unsorted/tile]-88.png diff --git a/forestry_resources/assets/forestry/textures/unsorted/tile]-89.png b/src/main/resources/assets/forestry/textures/unsorted/tile]-89.png similarity index 100% rename from forestry_resources/assets/forestry/textures/unsorted/tile]-89.png rename to src/main/resources/assets/forestry/textures/unsorted/tile]-89.png diff --git a/forestry_resources/assets/forestry/textures/unsorted/tile]-90.png b/src/main/resources/assets/forestry/textures/unsorted/tile]-90.png similarity index 100% rename from forestry_resources/assets/forestry/textures/unsorted/tile]-90.png rename to src/main/resources/assets/forestry/textures/unsorted/tile]-90.png diff --git a/forestry_resources/changelog/2.0.0.0 b/src/main/resources/changelog/2.0.0.0 similarity index 100% rename from forestry_resources/changelog/2.0.0.0 rename to src/main/resources/changelog/2.0.0.0 diff --git a/forestry_resources/changelog/2.0.0.1 b/src/main/resources/changelog/2.0.0.1 similarity index 100% rename from forestry_resources/changelog/2.0.0.1 rename to src/main/resources/changelog/2.0.0.1 diff --git a/forestry_resources/changelog/2.0.0.10 b/src/main/resources/changelog/2.0.0.10 similarity index 100% rename from forestry_resources/changelog/2.0.0.10 rename to src/main/resources/changelog/2.0.0.10 diff --git a/forestry_resources/changelog/2.0.0.11 b/src/main/resources/changelog/2.0.0.11 similarity index 100% rename from forestry_resources/changelog/2.0.0.11 rename to src/main/resources/changelog/2.0.0.11 diff --git a/forestry_resources/changelog/2.0.0.2 b/src/main/resources/changelog/2.0.0.2 similarity index 100% rename from forestry_resources/changelog/2.0.0.2 rename to src/main/resources/changelog/2.0.0.2 diff --git a/forestry_resources/changelog/2.0.0.3 b/src/main/resources/changelog/2.0.0.3 similarity index 100% rename from forestry_resources/changelog/2.0.0.3 rename to src/main/resources/changelog/2.0.0.3 diff --git a/forestry_resources/changelog/2.0.0.4 b/src/main/resources/changelog/2.0.0.4 similarity index 100% rename from forestry_resources/changelog/2.0.0.4 rename to src/main/resources/changelog/2.0.0.4 diff --git a/forestry_resources/changelog/2.0.0.5 b/src/main/resources/changelog/2.0.0.5 similarity index 100% rename from forestry_resources/changelog/2.0.0.5 rename to src/main/resources/changelog/2.0.0.5 diff --git a/forestry_resources/changelog/2.0.0.6 b/src/main/resources/changelog/2.0.0.6 similarity index 100% rename from forestry_resources/changelog/2.0.0.6 rename to src/main/resources/changelog/2.0.0.6 diff --git a/forestry_resources/changelog/2.0.0.7 b/src/main/resources/changelog/2.0.0.7 similarity index 100% rename from forestry_resources/changelog/2.0.0.7 rename to src/main/resources/changelog/2.0.0.7 diff --git a/forestry_resources/changelog/2.0.0.8 b/src/main/resources/changelog/2.0.0.8 similarity index 100% rename from forestry_resources/changelog/2.0.0.8 rename to src/main/resources/changelog/2.0.0.8 diff --git a/forestry_resources/changelog/2.0.0.9 b/src/main/resources/changelog/2.0.0.9 similarity index 100% rename from forestry_resources/changelog/2.0.0.9 rename to src/main/resources/changelog/2.0.0.9 diff --git a/forestry_resources/changelog/2.1.0.0 b/src/main/resources/changelog/2.1.0.0 similarity index 100% rename from forestry_resources/changelog/2.1.0.0 rename to src/main/resources/changelog/2.1.0.0 diff --git a/forestry_resources/changelog/2.2.0.0 b/src/main/resources/changelog/2.2.0.0 similarity index 100% rename from forestry_resources/changelog/2.2.0.0 rename to src/main/resources/changelog/2.2.0.0 diff --git a/forestry_resources/changelog/2.2.0.1 b/src/main/resources/changelog/2.2.0.1 similarity index 100% rename from forestry_resources/changelog/2.2.0.1 rename to src/main/resources/changelog/2.2.0.1 diff --git a/forestry_resources/changelog/2.2.0.2 b/src/main/resources/changelog/2.2.0.2 similarity index 100% rename from forestry_resources/changelog/2.2.0.2 rename to src/main/resources/changelog/2.2.0.2 diff --git a/forestry_resources/changelog/2.2.2.0 b/src/main/resources/changelog/2.2.2.0 similarity index 100% rename from forestry_resources/changelog/2.2.2.0 rename to src/main/resources/changelog/2.2.2.0 diff --git a/forestry_resources/changelog/2.2.2.1 b/src/main/resources/changelog/2.2.2.1 similarity index 100% rename from forestry_resources/changelog/2.2.2.1 rename to src/main/resources/changelog/2.2.2.1 diff --git a/forestry_resources/changelog/2.2.2.2 b/src/main/resources/changelog/2.2.2.2 similarity index 100% rename from forestry_resources/changelog/2.2.2.2 rename to src/main/resources/changelog/2.2.2.2 diff --git a/forestry_resources/changelog/2.2.4.0 b/src/main/resources/changelog/2.2.4.0 similarity index 100% rename from forestry_resources/changelog/2.2.4.0 rename to src/main/resources/changelog/2.2.4.0 diff --git a/forestry_resources/changelog/2.2.4.1 b/src/main/resources/changelog/2.2.4.1 similarity index 100% rename from forestry_resources/changelog/2.2.4.1 rename to src/main/resources/changelog/2.2.4.1 diff --git a/forestry_resources/changelog/2.2.4.2 b/src/main/resources/changelog/2.2.4.2 similarity index 100% rename from forestry_resources/changelog/2.2.4.2 rename to src/main/resources/changelog/2.2.4.2 diff --git a/forestry_resources/changelog/2.2.4.3 b/src/main/resources/changelog/2.2.4.3 similarity index 100% rename from forestry_resources/changelog/2.2.4.3 rename to src/main/resources/changelog/2.2.4.3 diff --git a/forestry_resources/changelog/2.2.6.0 b/src/main/resources/changelog/2.2.6.0 similarity index 100% rename from forestry_resources/changelog/2.2.6.0 rename to src/main/resources/changelog/2.2.6.0 diff --git a/forestry_resources/changelog/2.2.6.1 b/src/main/resources/changelog/2.2.6.1 similarity index 100% rename from forestry_resources/changelog/2.2.6.1 rename to src/main/resources/changelog/2.2.6.1 diff --git a/forestry_resources/changelog/2.2.6.2 b/src/main/resources/changelog/2.2.6.2 similarity index 100% rename from forestry_resources/changelog/2.2.6.2 rename to src/main/resources/changelog/2.2.6.2 diff --git a/forestry_resources/changelog/2.2.6.3 b/src/main/resources/changelog/2.2.6.3 similarity index 100% rename from forestry_resources/changelog/2.2.6.3 rename to src/main/resources/changelog/2.2.6.3 diff --git a/forestry_resources/changelog/2.2.8.2 b/src/main/resources/changelog/2.2.8.2 similarity index 100% rename from forestry_resources/changelog/2.2.8.2 rename to src/main/resources/changelog/2.2.8.2 diff --git a/forestry_resources/changelog/2.2.8.3 b/src/main/resources/changelog/2.2.8.3 similarity index 100% rename from forestry_resources/changelog/2.2.8.3 rename to src/main/resources/changelog/2.2.8.3 diff --git a/forestry_resources/changelog/2.2.8.4 b/src/main/resources/changelog/2.2.8.4 similarity index 100% rename from forestry_resources/changelog/2.2.8.4 rename to src/main/resources/changelog/2.2.8.4 diff --git a/forestry_resources/changelog/2.3.0.0 b/src/main/resources/changelog/2.3.0.0 similarity index 100% rename from forestry_resources/changelog/2.3.0.0 rename to src/main/resources/changelog/2.3.0.0 diff --git a/forestry_resources/changelog/2.3.0.1 b/src/main/resources/changelog/2.3.0.1 similarity index 100% rename from forestry_resources/changelog/2.3.0.1 rename to src/main/resources/changelog/2.3.0.1 diff --git a/forestry_resources/changelog/2.3.0.2 b/src/main/resources/changelog/2.3.0.2 similarity index 100% rename from forestry_resources/changelog/2.3.0.2 rename to src/main/resources/changelog/2.3.0.2 diff --git a/forestry_resources/changelog/2.3.0.3 b/src/main/resources/changelog/2.3.0.3 similarity index 100% rename from forestry_resources/changelog/2.3.0.3 rename to src/main/resources/changelog/2.3.0.3 diff --git a/forestry_resources/changelog/2.3.0.4 b/src/main/resources/changelog/2.3.0.4 similarity index 100% rename from forestry_resources/changelog/2.3.0.4 rename to src/main/resources/changelog/2.3.0.4 diff --git a/forestry_resources/changelog/2.3.0.5 b/src/main/resources/changelog/2.3.0.5 similarity index 100% rename from forestry_resources/changelog/2.3.0.5 rename to src/main/resources/changelog/2.3.0.5 diff --git a/forestry_resources/changelog/2.3.0.6 b/src/main/resources/changelog/2.3.0.6 similarity index 100% rename from forestry_resources/changelog/2.3.0.6 rename to src/main/resources/changelog/2.3.0.6 diff --git a/forestry_resources/changelog/2.3.0.7 b/src/main/resources/changelog/2.3.0.7 similarity index 100% rename from forestry_resources/changelog/2.3.0.7 rename to src/main/resources/changelog/2.3.0.7 diff --git a/forestry_resources/changelog/2.3.1.0 b/src/main/resources/changelog/2.3.1.0 similarity index 100% rename from forestry_resources/changelog/2.3.1.0 rename to src/main/resources/changelog/2.3.1.0 diff --git a/forestry_resources/changelog/2.3.1.1 b/src/main/resources/changelog/2.3.1.1 similarity index 100% rename from forestry_resources/changelog/2.3.1.1 rename to src/main/resources/changelog/2.3.1.1 diff --git a/forestry_resources/changelog/2.4.0.0 b/src/main/resources/changelog/2.4.0.0 similarity index 100% rename from forestry_resources/changelog/2.4.0.0 rename to src/main/resources/changelog/2.4.0.0 diff --git a/forestry_resources/config/forestry/colour.properties b/src/main/resources/config/forestry/colour.properties similarity index 100% rename from forestry_resources/config/forestry/colour.properties rename to src/main/resources/config/forestry/colour.properties diff --git a/forestry_resources/config/forestry/gamemodes/HARD.conf b/src/main/resources/config/forestry/gamemodes/HARD.conf similarity index 100% rename from forestry_resources/config/forestry/gamemodes/HARD.conf rename to src/main/resources/config/forestry/gamemodes/HARD.conf diff --git a/forestry_resources/config/forestry/gamemodes/NORMAL.conf b/src/main/resources/config/forestry/gamemodes/NORMAL.conf similarity index 100% rename from forestry_resources/config/forestry/gamemodes/NORMAL.conf rename to src/main/resources/config/forestry/gamemodes/NORMAL.conf diff --git a/forestry_resources/config/forestry/gamemodes/OP.conf b/src/main/resources/config/forestry/gamemodes/OP.conf similarity index 100% rename from forestry_resources/config/forestry/gamemodes/OP.conf rename to src/main/resources/config/forestry/gamemodes/OP.conf diff --git a/forestry_resources/config/forestry/hints.properties b/src/main/resources/config/forestry/hints.properties similarity index 100% rename from forestry_resources/config/forestry/hints.properties rename to src/main/resources/config/forestry/hints.properties diff --git a/forestry_resources/mcmod.info b/src/main/resources/mcmod.info similarity index 86% rename from forestry_resources/mcmod.info rename to src/main/resources/mcmod.info index b27a0f933..e9cf08cab 100755 --- a/forestry_resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -4,12 +4,12 @@ "name": "Forestry for Minecraft", "description": "Trees, bees and more.", "credits": "mistaqur, Binnie", - "logoFile": "/gfx/forestry/logo.png", + "logoFile": "/assets/forestry/logo.png", "version": "${version}", "mcversion": "${mcversion}", "url": "http://forestry.sengir.net/", "updateUrl": "http://forestry.sengir.net/wiki/index.php?n=Main.Downloads", - "authors": [ "SirSengir" ], + "authorList": [ "SirSengir" ], "screenshots": [ "/gfx/forestry/screenshots/screen1.jpg", "/gfx/forestry/screenshots/screen2.jpg" ], "dependencies": [ "mod_MinecraftForge"