Minecolonies

Mods
6,152,031 Downloads Last Updated: Oct 20, 2019 Game Version: 1.12.2

File Details

Filename minecolonies-universal-1.10.2-0.8.4063.jar
Uploaded by OrionOnline
Uploaded Sep 25, 2017
Game Version 1.10.2
Size 11.17 MB
Downloads 324,922
MD5 788a6e1ab297ac7cd31621cc14a9db36
Supported Minecraft 1.10 Versions
1.10.2
Supported Java Versions
Java 8

Changelog

Minecolonies Changelog

Version: 1.10.2-0.8.4063

  • New Beta (#1304)

Add shelves Add GuideBook (requires dependency) Adds sapling selector Several bug fixes. * Merge branch 'release/1.10' into testing/1.10 * Hotfix/lumberjack (#1231)

  • fix warehouse window

fix lumberjack building in smp/ssp fix lumberjack gui string

  • Already send to server th efirst time

  • add documentation

  • fix startup issue

  • Update BuildingLumberjack.java

  • fix manual assignment (#1228)

  • fix manual

  • fix manual housing bugs

  • fix comment

  • Version/1.10 (#1225)

  • Use the Buildertool as a unique Item in recipes to prevent conflicts

  • add builder tool to middle top slot for hut recipe (does not return it)

Conflicts: src/main/java/com/minecolonies/coremod/util/RecipeHandler.java

  • add addHutRecipe

  • Return the build tool when crafting hut's block

  • fix import

  • add final and better implementation

  • fix build

  • Small improvements to various flieds, including food Handling.

  • Port/more of colton (#1184)

  • port coltons adaptions

  • Auto stash for cherrypick of "Put item icon in the builder resource tab (#1033)"

  • port from 1.11

  • add line

  • fix gui

  • Done (#1210)

  • Feature/lumberjack sapling selector (#1189)

  • fix citizen if awol from townhall already

  • first lj adaptions

  • farmer should keep axe as well

for pumpkins and melons

  • Add some lumberjack handling

  • some adaptions and todos

  • adapt compatability

  • fix up the lumberjack gui

  • fix

  • Fix jdoc

  • Finishing up lj, fix baker, improve itemStorage

  • fix sound which should be removed

  • adapt delay

  • fix codacity

  • remove logger

  • port walkToProxy (#1220)

  • Fix/op level (#1120) (#1218)

  • correct the sound package messup

  • correct some formatting

  • fix problem with non-opped players

  • fix compile errors

Conflicts: src/main/java/com/minecolonies/coremod/commands/AbstractSingleCommand.java src/main/java/com/minecolonies/coremod/commands/CitizensCommand.java

  • Fix/small fixes2 (#1212)

  • fix nether colony again

I will insta merge this, this has been merged once before I don't know how this got removed

  • this is another hotfix which got lost

again insta merging it

  • Allows tinkers weapons

Also allows the player to add items in gamemode1 directly to the builder GUI

  • fix npe

  • improve damage calc

  • fix problem with builder gui requests

  • double Baker baking time

  • produce 6 cookies not 1

  • more cookies

... * Bug/1.10 dman not delivering tools (#1219)

  • Fix dman not delivering tool (but picking them up still)

  • rename isToolInHut -> retrieveToolInHut rename isToolInTileEntity -> retrieveToolInTileEntity quit early is the tool Type is NONE

  • this is another hotfix which got lost

again insta merging it * fix nether colony again

I will insta merge this, this has been merged once before I don't know how this got removed * Fix/farmer (#1165)

  • First part of farmer adaptions

  • Further adaptions

  • Some progress

  • 1.10 Deliver correct tool level (#1060)

  • To get tools we need to know the minimum level and the maximum level

  • javadoc

  • final

  • formating

  • Rename checkForTool by checkForNeededTool and change javadoc This method return true if the tool is not in the worker inventory which is the opposite to what the java doc used to say

  • finals

  • Add constants for tool level

  • import ToolLevel

  • fix TileEntityWareHouse

  • use constant tool level in delivery man

  • final

  • fix getMostEfficientTool (revert)

  • use isToolInProvider instead of isPickaxeInProvider

  • add missing Tool Level Constants

  • These nested if statements could be combined

  • remove unsused code

  • remove individual boolean for tools need

  • remove needsAxe, needsHoe ...

  • create a ToolType enum and use it

  • add missing file

  • sonar & Co

  • javadoc

  • fix build

  • javadoc

  • add getMaxToolLevel in AbstractBuilderWorker and use it to know what tools the worker can use

  • remove duplicated code

  • do not use isTool before hasToolLevel as the later already check is this is the right tool

  • remove box and fishing rod are they are not tool (wood, stone, iron, diamond)

  • add bow and hoe as tool take the enchement into consideration to chek against the max level

  • Move ItemStack util in there own file

  • Fishing rod and bow are tools

  • Use the correct tool level from the worker inventory

  • javadoc

  • Fixes sonar

  • fixes

  • remove weapon and pickaxe specific method

  • change max tool level to be getBuildingLevel() -1

  • remove logging

  • add request for bow and fishing rod

  • javadoc

  • remove isAxe, isPickaxe ... BuildingWorker inficate which tool need to be kept taking into account thir levels

  • javadoc

  • javadoc

  • Fix mining level for pickaxe, axe and shovel

  • use IToolType more request messages (W...

  • Adding a compatibility layer to make Ports between MC 1.10, 1.11 and 1.12 easier.
  • fix citizen if awol from townhall already (#1176)
  • Backport/1081 add new tokens (#1164)

  • Feature/factory (#1071)

  • move more utils

  • more moved

  • added factory

  • more factories

  • tokens

  • request

  • reformat and finish

  • fix imports

  • do merge

  • remove parts that are too fast

  • fix finals

  • fixed some last issues

  • Add new tokens (#1081)

  • move more utils

  • more moved

  • added factory

  • more factories

  • tokens

  • request

  • reformat and finish

  • fix imports

  • do merge

  • remove parts that are too fast

  • add new classes

  • add new tokens

  • add ItemStackUtils.loadItemStackFromNBT

  • Blockout cleanup (#1055) (#1163)

  • Move views into views package

  • Update xsd

  • Don?t use zero line width block, when we can just use view. More efficient in render stage, and looks the same.

  • Small fixes, things sonar will like

  • Move button handler to its own file

  • Update and increase documentation

  • Remove unused class, and created constant for rectangle color

  • extend Consumer<Button>

  • Curly brace line

Conflicts: src/main/java/com/minecolonies/coremod/client/gui/WindowHutDeliveryman.java * Feature/factory (#1071) (#1162)

  • move more utils

  • more moved

  • added factory

  • more factories

  • tokens

  • request

  • reformat and finish

  • fix imports

  • do merge

  • remove parts that are too fast

  • fix finals

  • fixed some last issues

  • Backport: Feature/move again (#1070) (#1160)

  • Feature/move again (#1070)

  • move more utils

  • more moved

  • fix imports

  • do merge

Conflicts: src/main/java/com/minecolonies/coremod/colony/Colony.java src/main/java/com/minecolonies/coremod/commands/MinecoloniesCommand.java src/main/java/com/minecolonies/coremod/commands/generalcommands/RandomTeleportCommand.java src/main/java/com/minecolonies/coremod/entity/EntityCitizen.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/guard/AbstractEntityAIGuard.java src/main/java/com/minecolonies/coremod/entity/pathfinding/AbstractPathJob.java src/main/java/com/minecolonies/coremod/items/ItemSupplyCampDeployer.java src/main/java/com/minecolonies/coremod/items/ItemSupplyChestDeployer.java src/main/java/com/minecolonies/coremod/network/messages/BuildToolPlaceMessage.java

  • fix double import
  • Added config option for wether the worker will work during rain (#1159)

(it does NOT affect wether they will go inside when it thunders) * Backport/1069 move more utils (#1158)

  • moving Blockutils (#1064)

Conflicts: src/api/java/com/minecolonies/api/util/BlockUtils.java src/main/java/com/minecolonies/coremod/blocks/AbstractBlockHut.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/pathfinding/AbstractPathJob.java src/main/java/com/minecolonies/coremod/items/ItemSupplyChestDeployer.java src/main/java/com/minecolonies/coremod/placementhandlers/PlacementHandlers.java

  • move compatibility (#1065)

Conflicts: src/api/java/com/minecolonies/api/compatibility/Compatibility.java src/main/java/com/minecolonies/coremod/util/Utils.java

  • remove unused import

  • Feature/dependant move (#1066)

  • moving Blockutils

  • move compatibility

  • move more utils

Conflicts: src/api/java/com/minecolonies/api/util/BlockPosUtil.java src/api/java/com/minecolonies/api/util/EntityUtils.java src/main/java/com/minecolonies/coremod/colony/Colony.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingBuilder.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingFarmer.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingGuardTower.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingLumberjack.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingMiner.java src/main/java/com/minecolonies/coremod/entity/EntityCitizen.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/deliveryman/EntityAIWorkDeliveryman.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/farmer/EntityAIWorkFarmer.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/farmer/Field.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/fisherman/EntityAIWorkFisherman.java src/main/java/com/minecolonies/coremod/entity/ai/citi... * fix nullpointer exception (#1156) * Backport/dependant move (#1154)

  • moving Blockutils (#1064)

Conflicts: src/api/java/com/minecolonies/api/util/BlockUtils.java src/main/java/com/minecolonies/coremod/blocks/AbstractBlockHut.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/pathfinding/AbstractPathJob.java src/main/java/com/minecolonies/coremod/items/ItemSupplyChestDeployer.java src/main/java/com/minecolonies/coremod/placementhandlers/PlacementHandlers.java

  • move compatibility (#1065)

Conflicts: src/api/java/com/minecolonies/api/compatibility/Compatibility.java src/main/java/com/minecolonies/coremod/util/Utils.java

  • remove unused import

  • Feature/dependant move (#1066)

  • moving Blockutils

  • move compatibility

  • move more utils

Conflicts: src/api/java/com/minecolonies/api/util/BlockPosUtil.java src/api/java/com/minecolonies/api/util/EntityUtils.java src/main/java/com/minecolonies/coremod/colony/Colony.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingBuilder.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingFarmer.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingGuardTower.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingLumberjack.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingMiner.java src/main/java/com/minecolonies/coremod/entity/EntityCitizen.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/deliveryman/EntityAIWorkDeliveryman.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/farmer/EntityAIWorkFarmer.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/farmer/Field.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/fisherman/EntityAIWorkFisherman.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/gu... * Backport/move compatibility (#1153)

  • moving Blockutils (#1064)

Conflicts: src/api/java/com/minecolonies/api/util/BlockUtils.java src/main/java/com/minecolonies/coremod/blocks/AbstractBlockHut.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/pathfinding/AbstractPathJob.java src/main/java/com/minecolonies/coremod/items/ItemSupplyChestDeployer.java src/main/java/com/minecolonies/coremod/placementhandlers/PlacementHandlers.java

  • move compatibility (#1065)

Conflicts: src/api/java/com/minecolonies/api/compatibility/Compatibility.java src/main/java/com/minecolonies/coremod/util/Utils.java

  • remove unused import
  • moving Blockutils (#1064) (#1152)

Conflicts: src/api/java/com/minecolonies/api/util/BlockUtils.java src/main/java/com/minecolonies/coremod/blocks/AbstractBlockHut.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIInteract.java src/main/java/com/minecolonies/coremod/entity/pathfinding/AbstractPathJob.java src/main/java/com/minecolonies/coremod/items/ItemSupplyChestDeployer.java src/main/java/com/minecolonies/coremod/placementhandlers/PlacementHandlers.java * Backport/colton delivery ai performance (#1138)

  • delivery ai & performance fix port of colton

  • This copies the 1.11 entityAiBasic

Waiting for other banch to be committed before comitting this.

  • fix the javadoc
  • adapt the pathing changes to 1.10 as well (#1137)
  • Compatibility/1.10 itemstack count (#1145)

  • 1.10 Deliver correct tool level (#1060)

  • To get tools we need to know the minimum level and the maximum level

  • javadoc

  • final

  • formating

  • Rename checkForTool by checkForNeededTool and change javadoc This method return true if the tool is not in the worker inventory which is the opposite to what the java doc used to say

  • finals

  • Add constants for tool level

  • import ToolLevel

  • fix TileEntityWareHouse

  • use constant tool level in delivery man

  • final

  • fix getMostEfficientTool (revert)

  • use isToolInProvider instead of isPickaxeInProvider

  • add missing Tool Level Constants

  • These nested if statements could be combined

  • remove unsused code

  • remove individual boolean for tools need

  • remove needsAxe, needsHoe ...

  • create a ToolType enum and use it

  • add missing file

  • sonar & Co

  • javadoc

  • fix build

  • javadoc

  • add getMaxToolLevel in AbstractBuilderWorker and use it to know what tools the worker can use

  • remove duplicated code

  • do not use isTool before hasToolLevel as the later already check is this is the right tool

  • remove box and fishing rod are they are not tool (wood, stone, iron, diamond)

  • add bow and hoe as tool take the enchement into consideration to chek against the max level

  • Move ItemStack util in there own file

  • Fishing rod and bow are tools

  • Use the correct tool level from the worker inventory

  • javadoc

  • Fixes sonar

  • fixes

  • remove weapon and pickaxe specific method

  • change max tool level to be getBuildingLevel() -1

  • remove logging

  • add request for bow and fishing rod

  • javadoc

  • remove isAxe, isPickaxe ... BuildingWorker inficate which tool need to be kept taking into account thir levels

  • javadoc

  • javadoc

  • Fix mining level for pickaxe, axe and shovel

  • use IToolType more request messages (WIP)

  • formating

  • remove commented out code

*... * Backport/colton/miner internals (#1136)

  • fix merge conflicts

  • fix merge conflicts

  • 1.10 Deliver correct tool level (#1060) (#1142)

  • 1.10 Deliver correct tool level (#1060)

  • To get tools we need to know the minimum level and the maximum level

  • javadoc

  • final

  • formating

  • Rename checkForTool by checkForNeededTool and change javadoc This method return true if the tool is not in the worker inventory which is the opposite to what the java doc used to say

  • finals

  • Add constants for tool level

  • import ToolLevel

  • fix TileEntityWareHouse

  • use constant tool level in delivery man

  • final

  • fix getMostEfficientTool (revert)

  • use isToolInProvider instead of isPickaxeInProvider

  • add missing Tool Level Constants

  • These nested if statements could be combined

  • remove unsused code

  • remove individual boolean for tools need

  • remove needsAxe, needsHoe ...

  • create a ToolType enum and use it

  • add missing file

  • sonar & Co

  • javadoc

  • fix build

  • javadoc

  • add getMaxToolLevel in AbstractBuilderWorker and use it to know what tools the worker can use

  • remove duplicated code

  • do not use isTool before hasToolLevel as the later already check is this is the right tool

  • remove box and fishing rod are they are not tool (wood, stone, iron, diamond)

  • add bow and hoe as tool take the enchement into consideration to chek against the max level

  • Move ItemStack util in there own file

  • Fishing rod and bow are tools

  • Use the correct tool level from the worker inventory

  • javadoc

  • Fixes sonar

  • fixes

  • remove weapon and pickaxe specific method

  • change max tool level to be getBuildingLevel() -1

  • remove logging

  • add request for bow and fishing rod

  • javadoc

  • remove isAxe, isPickaxe ... BuildingWorker inficate which tool need to be kept taking into account thir levels

  • javadoc

  • javadoc

  • Fix mining level for pickaxe, axe and shovel

  • use IToolType more request messages (WIP)

  • formating

  • remove commented out code...

  • avoid concurrent modificatione xception (#1128)
  • Feature/mesa style (#1133)

  • The new mesa style

  • Fix townhall schematic

  • Make substitution black easy to mine (#1132)

  • Make substitution black easy to mine

  • Add recipe for the Baker's hut

  • remove various warnings

  • Adding Townhall Stats 1.10 (#1130)

  • Adding Townhall Stats (#1124)

  • Adding Townhall Stats

Added stats on Info Page of Towhall for miners, fishermen, guards, lumberjacks and farmer. Also moved Total Happiness from Actions page to Info Page

  • remove unused import

  • Gets rid of Sonars Nested Ternary Operations error

I know it's ugly but i can't really think of another way to do it, sorry, i don't completely understand lambdas yet.

  • Making codacy happy

Changed a couple variable to immutable (final)

  • Sonar Check

I'd like to see what sonar says about this.

  • Moved stuff into TranslationConstats.java

  • Un-Nested ternary Operations

I think this one is clear, what do you guys think? also made codacy happy bye changing something to Immutable

  • removed unnecessary comparisons

and got confused about sonar. lol. think i got it though

  • Moved Open Curly braces

Wow, just wow.

  • Moved more curly braces....

  • Un-Nested ternary Operations 2.0

Wow, so much simpler

  • Got rid of un-used import

Woops

  • Change Files Names Back

  • Added Baker

  • Added some stuff back into the .lang file

  • moved Translation Constants

  • Remove, and change constants

  • Feature/#790 baker (#1073)

  • -what's going on here?

  • -small things

  • -my progress for ray

  • first setup

  • correct baker huts for all styles

  • add rendering for baker etc

  • some more adaptions

  • Create some backend systems for the baker

  • Fill in those systems

  • Fix female baker rotation angles

  • somre more todos

  • Add some recipe handling

  • register furnaces correctly

  • Setup the basis for the baker

  • Set up correct recipe handling

  • Fix up baker

He should be pretty much stable now Probably needs some more handling but is quite stable already

  • Fix small bugs

Product needs equal method, baker has to reset after finishing, add todos as well

  • Fix some bugs with changes recipes

  • Baker fixes

  • fix javadoc

  • change import

  • Fix recipe and asynch requesting

  • Fix cocoa recipe

  • dump earlier and giv eback enough buckets

  • balance the baker

  • fix compile error

  • Compile all the jars together

  • Fix up baker

  • fix license

  • fix licence

  • fix licence

  • further baker adaptions

  • fix javadoc

  • Workaround for recipe fix

  • Fix duping bug

  • fix baker arm

  • fix lj and builder gathering problem

  • fix style issues

  • fix reviews

  • Fix annotations

  • optimize imports

  • Optimize imports and fix coltons revision

  • do this

  • done

  • make sure to not request double

  • that should fix it now.

  • Make asynch requesting extra

and maybe fix a bad bug with our req system

  • fix compile error

  • fix javadoc

  • not needed there anymore

  • Feature/sounds (#1118)

  • add farmer soud file + dman sounds louderr

  • Add all female farmer sounds

  • configure and register sounds

  • fix small sound problem and add new citizen hut chest

  • fix textures

  • fix farmer dir

  • improve rotation of citizen hut

  • Should fix farmer crash, also few other small quality changes (#1091)
  • upgrade to officer on addOfficer if already added (#1089)

  • upgrade to officer on addOfficer if already added

  • change to equals

  • Add better safety checking on permissions packet handler

  • Add possibility to show list of abandoned colonies (#1087)

  • Add possibility to show list of abandoned colonies

since hours

  • deleted not needed command

  • fix review

  • fix minor issues

  • change to automatic detection

  • make local var final

  • Merge branch 'testing/1.10' into version/1.10
  • Merge branch 'release/1.10' into testing/1.10
  • Compile all the jars together (#1080)
  • Merge branch 'testing/1.10' into version/1.10

Conflicts:

src/main/java/com/minecolonies/coremod/colony/buildings/BuildingBuilder.java

src/main/java/com/minecolonies/coremod/util/constants/TranslationConstants.java

  • Feature/1.10 efficient dman (#1044)

  • Feature/1.10 efficient dman (#1017)

  • gather from the chest which have just been delivered

  • Deliver mor ethan one stack at a time depending of the deliveryman hut's level

    • in BuildingBuilder override neededForWorker instead of using the custom requiresResourceForBuilding method
  • Add container to building event when the builder did not have to build it

  • register block in AbstractBuilding instead of adding container only, so that extending class could register any type of block, not only chests

  • remove checkInWareHouseForFood method in favour of polymorphisme

  • remove duplicated code

  • javadoc

  • language constant

  • revert back some changes

Conflicts: src/main/java/com/minecolonies/coremod/colony/buildings/AbstractBuilding.java src/main/java/com/minecolonies/coremod/colony/buildings/BuildingBuilder.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/deliveryman/EntityAIWorkDeliveryman.java

  • Citizen hut need food
  • Introduce initial API scaffolding and modules. (#1068)

  • Introduce initial API scaffolding and modules.

Conflicts: build.gradle src/main/java/com/minecolonies/coremod/blocks/AbstractBlockHut.java src/main/java/com/minecolonies/coremod/client/gui/WindowTownHall.java src/main/java/com/minecolonies/coremod/colony/ColonyView.java src/main/java/com/minecolonies/coremod/colony/permissions/Permissions.java src/main/java/com/minecolonies/coremod/commands/AbstractSingleCommand.java src/main/java/com/minecolonies/coremod/commands/AddOfficerCommand.java src/main/java/com/minecolonies/coremod/commands/ColonyTeleportCommand.java src/main/java/com/minecolonies/coremod/commands/DeleteColonyCommand.java src/main/java/com/minecolonies/coremod/commands/KillCitizenCommand.java src/main/java/com/minecolonies/coremod/network/messages/BuildToolPlaceMessage.java src/main/java/com/minecolonies/coremod/network/messages/PermissionsMessage.java src/main/java/com/minecolonies/coremod/permissions/ColonyPermissionEventHandler.java src/main/java/com/minecolonies/coremod/util/AchievementUtils.java src/main/java/com/minecolonies/coremod/util/ServerUtils.java

  • marvin hot fix

  • fix tinker

  • use neededForWorker (#1056) (#1059)

add translation constants * Bug/builder tools needed (#1047) (#1050)

  • Builder may need axes

  • remove Utils.isMiningTool

  • remove unused code

  • add axe for the miner

Conflicts: src/main/java/com/minecolonies/coremod/colony/buildings/BuildingBuilder.java * Hotfix: Fix itemframe messups in Buildings. * Dismount before teleporting, and add check for invalid line width (#1036) * Check if citizen is jobless before triggering job death achievement (#1038) * Bugfix/#758 concurrency issue (#1025) (#1029)

  • Centralize the copying of the needed items list, and make it explicitly clear a copy is happening

  • Remove duplicated methods, and unnecessary casts

  • Change CopyOnWriteArrayList to ConcurrentLinkedQueue for current warehouse tasks.

The list is being modified often, and being treated like a queue. The ConcurrentLinkedQueue should be a better data structure for the situation and be more performant. * Merge branch 'version/1.10' into testing/1.10 * Refactor/1.11 workorders (#1012) (#1013)

  • Suppress some warning

  • Add worker name to the message when chest is full

  • Fix warnings for PlacementHandlers

  • Builder say when then start a job

  • WorkOrderBuildHut extends WorkOrderBuildDecoration instead of WorkOrderBuildDecoration extends WorkOrderBuild

  • revert WorkOrderBuildHut class to WorkOrderBuild

  • Work Manager does not need to know about Construction tape and WorkOrderBuildDecoration

  • JobBuilder class does not need to know about WorkOrderBuild

  • remove duplicated code

  • add package info

  • Sonar suppress

Conflicts: src/main/java/com/minecolonies/coremod/colony/WorkManager.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/builder/ConstructionTapeHelper.java * make waypoints render when buildtool open (#1004)

  • make waypoints render when buildtool open

  • Fix javadoc

  • javadoc

  • Add colony border rendering as well

  • fix sonar issues

  • fix door duping of builder

  • Make marvin happy, add package info.

  • fix up buggy behavior

  • fix annotations and sonar issues

  • fix it up

  • bug #1014 fix crash when a colony does not have any owner (#1015)

  • fix crash when a colony does not have any owner

  • remove logging

  • Merge branch 'version/1.10' into testing/1.10
  • Feature/1.10 better chat (#994) (#1007)

  • Feature/1.10 better chat (#994)

  • Suppress some warning

  • Add worker name to the message when chest is full

  • remove warnings

  • Builder say when then start/end a job

  • Shorter chat version for colony owner

  • D-man only say that the chest if full when ihe cannot swap D-man say whose chest is full

  • Change dman saying

  • Compare itemstack properly

  • Different message when pick axe requested level is greater than hut level

  • D-man hold the item he will deliver or the item he did gather Fix javadoc

  • EntityCitizen does not know about BuildingFarmer now

  • remove most of the Jobs from EnityCitizen

  • dman hold the correct item

Conflicts: src/main/java/com/minecolonies/coremod/colony/buildings/BuildingFarmer.java src/main/java/com/minecolonies/coremod/colony/jobs/AbstractJob.java src/main/java/com/minecolonies/coremod/entity/EntityCitizen.java src/main/java/com/minecolonies/coremod/entity/ai/citizen/builder/EntityAIStructureBuilder.java src/main/resources/assets/minecolonies/lang/en_US.lang

  • add some package info

  • package info

  • Feature/builder pickup (#1002)

  • Make builder pickup items after building

  • sonar fix cast to double

  • remove unused import

  • remove double guard code 1.10

  • unused import

  • Update doc

  • Add female dman sounds + functionality for hostile and saturation (#990)

  • Add female dman sounds + functionality for hostile and saturation

  • be happy sonar

  • fix nullpointer exception

  • increase chance

  • fix small bug

  • remove import

  • Update EntityAICitizenAvoidEntity.java

  • Fix dman sound surpress template

  • stage

  • Might look better like this.

  • add package info

  • Fix problematic behavior

  • imports

  • Feature/builder pickup (#999)

  • Make builder pickup items after building

  • sonar fix cast to double

  • remove unused import

  • Sonar/warnings (#992) (#995)

  • Sonar/warnings (#992)

  • Fix Blockers

  • first draft for translation constants

  • fix formatting

  • fix some constants and other issues

  • formatting

  • fix some ternaries

  • sonar fixes

  • add suppress

  • add doc files

  • reorder

  • wtf java

  • last fixes

  • remove unused

  • Update InventoryCitizen.java

  • Update WindowHireWorker.java

  • Update WindowHireWorker.java

  • Fix/colony crash10 (#998)

  • Stop crashing with other world events

  • add new creativetab design to 1.10

  • Fix/builder duping 10 (#988)

  • fix lumberjack position finding and fix builder position finding

  • Fix sonar issues

  • Fix Tarzan climbing the trees

Uhm I meant the lumberjack

  • fix bug where citizen start all up with 1

  • Fix problem with builder requesting double

  • don't request solid placeholder if world is solid

  • make citizen only tp if employed

  • recalculate after reload

  • balance happiness depending on guards

  • 1.10 d-man delivery fix (#986)

  • 1.11 d-man delivery fix (#980)

  • Fix forceTransferStack return value Fix some java doc

  • Fix javadoc

  • Fix happiness calculation about housing

  • Transfer for real instead of simulating

  • remove some warnings

Conflicts: src/main/java/com/minecolonies/coremod/colony/Colony.java src/main/java/com/minecolonies/coremod/util/InventoryUtils.java

  • sonar
  • Merge branch 'version/1.10' into testing/1.10
  • Average Housing on Happiness Calculation (#981)

Fixes: #978 * Hotfix/low stats (#976)

  • fix lumberjack position finding and fix builder position finding

  • Fix sonar issues

  • Fix Tarzan climbing the trees

Uhm I meant the lumberjack

  • fix bug where citizen start all up with 1
  • Merge remote-tracking branch 'origin/testing/1.10' into testing/1.10
  • bump version
  • bump version
  • remove unimplemented huts (#973)
  • Fix/no tarzan (#974)

  • fix lumberjack position finding and fix builder position finding

  • Fix sonar issues

  • Fix Tarzan climbing the trees

Uhm I meant the lumberjack * Feature/better builder lj positioning (#952)

  • fix lumberjack position finding and fix builder position finding

  • Fix sonar issues

  • Merge branch 'testing/1.10' into version/1.10
  • Merge remote-tracking branch 'origin/release/1.10' into testing/1.10
  • Feature/limit warehouse (#948)

  • should fix the no tinkers crashes

  • should fix trange crash

  • Fix fisherman

  • limit warehouse

  • Hotfix for the DMan (#940)

  • Hotfix for the DMan not behaving properly cause it is not getting reported about the insertion result

  • Fixing a type in the iteration for the extraction slots of the DMan

  • Merge branch 'testing/1.10' into version/1.10
  • Merge branch 'release/1.10' into testing/1.10
  • Merge remote-tracking branch 'origin/version/1.10' into version/1.10
  • 1.10-Rewrite handleKeepX to be identical than release/1.11 (#931)

  • Rewrite handleKeepX to be identical that release/1.11

  • fix package info

  • Merge branch 'testing/1.10' into version/1.10
  • Merge branch 'release/1.10' into testing/1.10
  • Merge branch 'release/1.10' into testing/1.10
  • Merge remote-tracking branch 'origin/version/1.10' into testing/1.10
  • Update build.properties
  • Merge remote-tracking branch 'origin/version/1.10' into testing/1.10
  • Adding Changelog generation. (#896)

Signed-off-by: OrionOnline oriondevelopment@outlook.com * Feature/buildtool server side nbt develop (#879)

  • Feature/buildtool server side nbt (#777)

  • Add a persistent UUID to the server, saved in minecolomies.dat Send the UUID to the client when the player log in. The UUID will be use to create a directory on the client to store data specific to a server

  • request as schematic from the client and send the schematic back by the server

  • Allow to override huts and decorations by nbt file in a directory

  • Add custom decoration (from local player) Cache file using the md5 hash as a file name inside cache directory When the player want to use custom, he will need to send the schematic unless the cache/<md5 hash> already exists

Schematic can be send to the server only if enabled in the configuration (disable by default), no schematic management is done yet, no limitation on the number of schamatic send, unused one are still there.

  • Remember the last structure build, so we can quicky build it again, usefull for walls Store the name instead of index as they may change

  • Allow to rename/delete custom schematic

Conflicts: src/main/java/com/minecolonies/coremod/MineColonies.java src/main/java/com/minecolonies/coremod/client/gui/WindowBuildTool.java src/main/java/com/minecolonies/coremod/colony/Structures.java src/main/java/com/minecolonies/coremod/colony/buildings/AbstractBuilding.java src/main/java/com/minecolonies/coremod/colony/workorders/WorkOrderBuild.java src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIStructure.java src/main/java/com/minecolonies/coremod/network/messages/BuildToolPlaceMessage.java src/main/java/com/minecolonies/coremod/network/messages/SaveScanMessage.java src/main/java/com/minecolonies/coremod/util/ClientStructureWrapper.java

  • javadoc
  • Merge branch 'testing/1.10' into version/1.10
  • Merge branch 'release/1.10' into testing/1.10
  • Patch in the CurseForge upload module. (#881)

I forgot to add the module when I Marvins pr. * Feature/happiness n hunger (#887)

  • Fix exceptions with blockFire

Also fix problem with coarse dirt and podzol

  • Improve flint&Steel handling

And fix coarse dirt for good

  • Fix the requesting of the flint and steel and fishing rod if used

  • sonar fixes and more

  • improve grass handling

  • fix small bug

  • some more sonar fixes

  • Removing dependencies of Abstract class to siblings

  • Fix up javadoc

  • First part saturation and colony happiness

  • Handle food gathering

  • Some adaptions for the dman

  • Adapt class check to predicate

  • Refactor building code

  • add missing handlers

  • Improve saturation handling

  • fix grasspath issue

  • improve handling part 1

  • fix general handler

  • part 2

  • fix placement handler bug

  • only get certain amount

  • fix bug

  • Remove surpress

  • suppress for now

  • Update Colony.java

  • Request saturation correctly

  • Add requesting, fix builder bugs

  • Fix logik error

  • small adaptions

  • Also citizens without home can talk

  • Improve counter attack of guards and update the colony

  • fix error with stuck dman

  • fix delivery

  • avoid friendly fire for counter attack

  • Higher food necessity at higher building level

  • Add comments and let dman take extra food with him if saturation low

  • fix nullpointer exception

  • Patch in the CurseForge upload module.

I forgot to add the module when I Marvins pr. * -If the tree is a slime tree is now stored in NBT (#882) * Feature/happiness n hunger (#880)

  • Fix exceptions with blockFire

Also fix problem with coarse dirt and podzol

  • Improve flint&Steel handling

And fix coarse dirt for good

  • Fix the requesting of the flint and steel and fishing rod if used

  • sonar fixes and more

  • improve grass handling

  • fix small bug

  • some more sonar fixes

  • Removing dependencies of Abstract class to siblings

  • Fix up javadoc

  • First part saturation and colony happiness

  • Handle food gathering

  • Some adaptions for the dman

  • Adapt class check to predicate

  • Refactor building code

  • add missing handlers

  • Improve saturation handling

  • fix grasspath issue

  • improve handling part 1

  • fix general handler

  • part 2

  • fix placement handler bug

  • only get certain amount

  • fix bug

  • Remove surpress

  • suppress for now

  • Update Colony.java

  • Request saturation correctly

  • Add requesting, fix builder bugs

  • Fix logik error

  • small adaptions

  • Also citizens without home can talk

  • Improve counter attack of guards and update the colony

  • fix error with stuck dman

  • fix delivery

  • avoid friendly fire for counter attack

  • Higher food necessity at higher building level

  • Add comments and let dman take extra food with him if saturation low

  • fix nullpointer exception

  • Patch in the CurseForge upload module.

I forgot to add the module when I Marvins pr. * Merge testing to release [1.10] (#1249)

This is a release. It contains mayor bug fixes and new features:

Lumberjack gui improvements. Manual citizen assignment. Pathfinding improvements. New Worker (Baker). New Hunger System Improved deliveryman. * hotfix the hotfix * Hotfix/1.10 release wrong world (#1108)

Insta merge, we need this on the server! * fix crash (#1107)

Will merge this since we need that asap on the server. * Release new 1.11 (#961)

  • Create suppressing.MD (#876)

  • Finishing Base Merge. (#883)

  • Finishing Base Merge. (#886)

  • Port/1.11/cap inventory interaction (#818)

  • Updated the Inventory system to capabilities in 1.11

Signed-off-by: OrionOnline oriondevelopment@outlook.com

  • Add CheckStyle and PMD as plugins to the build.gradle. (#784)

  • Adding/Updating Style Data.

Added: * pmd.xml. Holds the PMD Configuration from the PMD Module of the SonarQube Server.

Updated: * checkstyle.xml. Holds the additional style checks SonarQube performs.

  • Added PMD and Checkstyle gradle plugins.

Updated: * build.gradle to add PMD and Checkstyle Gradle-plugins. * CheckStyle.xml to reflect the Minecolonies coding style.

  • Added PMD and Checkstyle gradle plugins.

Updated: * build.gradle to add PMD and Checkstyle Gradle-plugins. * CheckStyle.xml to reflect the Minecolonies coding style.

  • Some small reformatting to trigger a new build.

  • Shrink maximal line length to 180

  • Switch to TeamCity (#792)

  • Switch to TeamCity

Add support for TeamCity Branch and Build number, having Travis as a fallback

  • Update build.gradle

  • trigger a new build

  • Some last merging fixes - and Formatting of course.

Signed-off-by: OrionOnline oriondevelopment@outlook.com

  • Some last merging fixes - and Formatting of course.

Signed-off-by: OrionOnline oriondevelopment@outlook.com

  • Small minor changes to make the base change work.

Signed-off-by: OrionOnline oriondevelopment@outlook.com

  • Merge Fix/cap based interaction (#800)

  • Fix the TransferItemsRequestMessage.

  • Fix NPE when tools are searched in inventories with empty slots.

  • Fix possible NPE in search for tools.

  • Some NPE Fixes and Formatting.

  • Removed getFirstFillableSlotInItemHandler and other related methods.

  • Changed the way Sonar replacement is handled. It is run once now at the end of a build.

  • Fixing an Item Duplicati...

  • Release new 1.10 (#960)

  • Patch in the CurseForge upload module. (#881)

I forgot to add the module when I Marvins pr.

  • Feature/happiness n hunger (#880)

  • Fix exceptions with blockFire

Also fix problem with coarse dirt and podzol

  • Improve flint&Steel handling

And fix coarse dirt for good

  • Fix the requesting of the flint and steel and fishing rod if used

  • sonar fixes and more

  • improve grass handling

  • fix small bug

  • some more sonar fixes

  • Removing dependencies of Abstract class to siblings

  • Fix up javadoc

  • First part saturation and colony happiness

  • Handle food gathering

  • Some adaptions for the dman

  • Adapt class check to predicate

  • Refactor building code

  • add missing handlers

  • Improve saturation handling

  • fix grasspath issue

  • improve handling part 1

  • fix general handler

  • part 2

  • fix placement handler bug

  • only get certain amount

  • fix bug

  • Remove surpress

  • suppress for now

  • Update Colony.java

  • Request saturation correctly

  • Add requesting, fix builder bugs

  • Fix logik error

  • small adaptions

  • Also citizens without home can talk

  • Improve counter attack of guards and update the colony

  • fix error with stuck dman

  • fix delivery

  • avoid friendly fire for counter attack

  • Higher food necessity at higher building level

  • Add comments and let dman take extra food with him if saturation low

  • fix nullpointer exception

  • Patch in the CurseForge upload module.

I forgot to add the module when I Marvins pr.

  • -If the tree is a slime tree is now stored in NBT (#882)

  • Feature/happiness n hunger (#887)

  • Fix exceptions with blockFire

Also fix problem with coarse dirt and podzol

  • Improve flint&Steel handling

And fix coarse dirt for good

  • Fix the requesting of the flint and steel and fishing rod if used

  • sonar fixes and more

  • improve grass handling

  • fix small bug

  • some more sonar fixe...

  • should fix the no tinkers crashes (#941)

  • should fix the no tinkers crashes

  • should fix trange crash

  • Fix fisherman

  • fix nullpointer
  • possible fix?

Additional Files