fix the smelter #2189

Raycoms · 2018-02-07T23:57:25Z

Rewrite of the smelter should work way smoother and less error-prone now.

Changes proposed in this pull request:

Simplifying the smelter tasks.
More iterations through START_WORKING
Need this tested first!

Review please

Add javadocs. Use translation constants. Use consistent naming for AI states and AI State methods. Note areas where changes should be made. Fix checkstyle warnings. Combine startWorking() and checkForAdditionalJobs() as the division is arbitrary.

…elter

marchermans · 2018-02-09T08:07:13Z

src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIUsesFurnace.java

+     */
+    private AIState fillUpFurnace()
+    {
+        if (((BuildingSmeltery) getOwnBuilding()).getFurnaces().isEmpty())


Are you sure this works for the Cook. Is his building an instance of BuildingSmeltery or BuildingRestaurant?

BuildTeamLinter · 2018-02-09T12:56:23Z

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

+ * Abstract Class for all furnace users.
+ */
+@SuppressWarnings(OVERRIDE_EQUALS)
+public abstract class AbstractBuildingFurnaceUser extends AbstractBuildingWorker


Override the "equals" method in this class.

BuildTeamLinter · 2018-02-09T15:26:03Z

SonarQube analysis reported 64 issues

1 critical
54 major
1 minor
8 info

Watch the comments in this conversation to review them.

Top 10 extra issues

Note: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:

BlockConstructionTape.java#L360: Reduce the number of conditional operators (7) used in the expression (maximum allowed 6).
blocks#: Add a 'package-info.java' file to document the 'blocks' package
BlockConstructionTape.java#L360: Assign this magic number 3 to a well-named constant, and use the constant instead.
BlockConstructionTape.java#L360: Assign this magic number 3 to a well-named constant, and use the constant instead.
BlockConstructionTape.java#L448: Reduce this class from 59 to the maximum allowed 30 or externalize it in a public class.
gui#: Add a 'package-info.java' file to document the 'gui' package
render#: Add a 'package-info.java' file to document the 'render' package
colony#: Add a 'package-info.java' file to document the 'colony' package
buildings#: Add a 'package-info.java' file to document the 'buildings' package
BuildingSmeltery.java#L97: Assign this magic number 3 to a well-named constant, and use the constant instead.

Rewrite of Smelter and cook to gain more stability. Also fixes the hitboxes of the new construction-tape.

…2189)"

* Open GUI on server-side, not client-side (#2195) Changes proposed in this pull request: Get rid of evil comment. Change gui open from client-side to server-side. (Fixes #2194) * fix the smelter (#2189) Rewrite of Smelter and cook to gain more stability. Also fixes the hitboxes of the new construction-tape. * fixe herders spawn egg problem and cycling recipes (#2202) * Feature/better builder (#2209) Fixes message concurrency issues Fixes timberframe issues Fixes dumping issues * 1.11/last-changes: Auto stash before cherrypick of "fix the smelter (#2189)" * fix compile issues * Minor fixes (#2226) Fixes constructiontape being placed on workLoad Fixes issues with deleted structures Protects buildings from being detected as trees Reduces particle effects Reports block position if tool is not good enough.

fix the smelter

e17566e

Raycoms added the In Progress label Feb 7, 2018

the other way around

d72ff81

ldtteam deleted a comment Feb 8, 2018

mkienenb and others added 7 commits February 8, 2018 16:18

Clean up code. No logic changes.

0887fc8

Add javadocs. Use translation constants. Use consistent naming for AI states and AI State methods. Note areas where changes should be made. Fix checkstyle warnings. Combine startWorking() and checkForAdditionalJobs() as the division is arbitrary.

Move isSomethingInOven to EntityAiWorkCook

27ede3f

Remove unused field isOvenFull and corresponding NBT tag "cooking"

b032e3b

Setting latest status at start of every AIState.

b2416f7

Move isSomethingInOven to EntityAiWorkCook

c0b5a43

Merge remote-tracking branch 'origin/clean-up-AI-cook-v2' into fix/sm…

525151e

…elter

Extract into abstract class, adapt cook to it.

a8557a1