Merge branch 'version/main' into fix/teams_assignment_behaviour

# Conflicts:
#	src/main/java/com/minecolonies/core/entity/citizen/EntityCitizen.java

gradle.properties

@@ -73,8 +73,10 @@ crowdinId=minecolonies
 usesDatagen=true
 usesOptifine=false
 useDefaultTestSystem=false
-runtimeSourceSets=api;main
-librarySourceSets=api;main;datagen;
+projectHasApi=false
+runtimeSourceSets=main
+librarySourceSets=main;datagen;
+primaryJarClassifier=
 
 extendDefaultSourceSetConfiguration=true
 mainExcludedResources=assets/minecolonies/lang/manual_en_us.json;assets/minecolonies/lang/default.json;assets/minecolonies/lang/quests.json
@@ -91,7 +93,6 @@ usesSonarQube=true
 
 usesCrowdInTranslationManagement=true
 crowdInDownloadDirectory=src/main/resources/assets/minecolonies/lang
-usesCrowdInBuildingWithFilteredBranches=true
-usesCrowdInUploadWithFilteredBranches=true
+usesCrowdInUploadWithFilteredBranchesSpec=(version|release)\/.+
 
 additionalModsInDataGen=structurize;domum_ornamentum

gradle/dependencies.gradle

@@ -18,26 +18,17 @@ repositories {
 }
 
 dependencies {
-    apiCompileOnly (fg.deobf("com.ldtteam:domum_ornamentum:${project.domumOrnamentumVersion}:universal")){
-        transitive = false
-    }
     compileOnly (fg.deobf("com.ldtteam:domum_ornamentum:${project.domumOrnamentumVersion}:universal")){
         transitive = false
     }
     runtimeOnly (fg.deobf("com.ldtteam:domum_ornamentum:${project.domumOrnamentumVersion}:universal")){
         transitive = false
     }
 
-    apiImplementation (fg.deobf("com.ldtteam:blockui:${project.blockUI_version}")){
-        transitive = false
-    }
     implementation (fg.deobf("com.ldtteam:blockui:${project.blockUI_version}")){
         transitive = false
     }
 
-    apiImplementation (fg.deobf("com.ldtteam:structurize:${project.structurize_version}")){
-        transitive = false
-    }
     implementation (fg.deobf("com.ldtteam:structurize:${project.structurize_version}")){
         transitive = false
     }

src/datagen/generated/minecolonies/assets/minecolonies/lang/default.json

@@ -119,6 +119,8 @@
   "com.minecolonies.research.combat.captainoftheguard.name": "Captain of the Guard",
   "com.minecolonies.research.combat.captaintraining.name": "Captain Training",
   "com.minecolonies.research.combat.cleave.name": "Cleave",
+  "com.minecolonies.research.combat.coffee.name": "Coffee",
+  "com.minecolonies.research.combat.coffee.subtitle": "Keeps guards awake",
   "com.minecolonies.research.combat.deadlyaim.name": "Deadly Aim",
   "com.minecolonies.research.combat.deadlyaim.subtitle": "Just don't aim at me!",
   "com.minecolonies.research.combat.diamondskin.name": "Diamond Skin",
@@ -228,6 +230,7 @@
   "com.minecolonies.research.effects.fleeingspeedaddition.description": "Fleeing Guards Gain Swiftness %2$s",
   "com.minecolonies.research.effects.gravedecaybonus.description": "Citizen Graves Take %s More Minutes to Decay",
   "com.minecolonies.research.effects.growthmultiplier.description": "Child Growth Rate +%3$s%%",
+  "com.minecolonies.research.effects.guardcrit.description": "Guards have a chance to score critical hits",
   "com.minecolonies.research.effects.happinessmultiplier.description": "Citizen Happiness +%3$s%%",
   "com.minecolonies.research.effects.healingsaturationlimitaddition.description": "Healing Saturation Min %s",
   "com.minecolonies.research.effects.healthaddition.description": "Citizen HP +%s",

src/datagen/generated/minecolonies/data/minecolonies/researches/combat/accuracy.json

@@ -2,11 +2,11 @@
   "branch": "minecolonies:combat",
   "effects": [
     {
-      "minecolonies:effects/sleeplessmultiplier": 1
+      "minecolonies:effects/guardcrit": 1
     }
   ],
   "exclusiveChildResearch": true,
-  "icon": "minecraft:lime_bed",
+  "icon": "minecraft:iron_sword",
   "requirements": [
     {
       "building": "guardtower",

src/datagen/generated/minecolonies/data/minecolonies/researches/combat/coffee.json

@@ -0,0 +1,23 @@
+{
+  "branch": "minecolonies:combat",
+  "effects": [
+    {
+      "minecolonies:effects/sleeplessmultiplier": 1
+    }
+  ],
+  "icon": "minecraft:lime_bed",
+  "parentResearch": "minecolonies:combat/tactictraining",
+  "requirements": [
+    {
+      "type": "minecolonies:item_list",
+      "item": {
+        "items": [
+          "minecraft:golden_carrot"
+        ]
+      },
+      "quantity": 4
+    }
+  ],
+  "researchLevel": 2,
+  "subtitle": "com.minecolonies.research.combat.coffee.subtitle"
+}

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutalchemist.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutarchery.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutbarracks.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutblacksmith.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutcombatacademy.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutcomposter.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutconcretemixer.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutcrusher.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutdyer.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutfletcher.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutflorist.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutglassblower.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutgraveyard.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhuthospital.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutlibrary.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutmechanic.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutmysticalsite.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutnetherworker.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutplantation.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutsawmill.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutschool.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutsifter.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutsmeltery.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutstonemason.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/blockhutstonesmeltery.json

@@ -1,3 +1,6 @@
 {
-  "effect": true
+  "effect": true,
+  "levels": [
+    5.0
+  ]
 }

src/datagen/generated/minecolonies/data/minecolonies/researches/effects/guardcrit.json

@@ -0,0 +1,9 @@
+{
+  "effect": true,
+  "levels": [
+    0.2,
+    0.3,
+    0.4,
+    0.5
+  ]
+}

src/datagen/generated/minecolonies/data/minecolonies/tags/worldgen/biome/humidbiomes.json

@@ -4,6 +4,7 @@
     "#forge:is_wet/overworld",
     "minecraft:bamboo_jungle",
     "minecraft:beach",
+    "minecraft:river",
     "minecraft:warm_ocean",
     "minecraft:dripstone_caves",
     "minecraft:jungle",

src/main/java/com/minecolonies/api/blocks/decorative/AbstractColonyFlagBanner.java

@@ -53,21 +53,27 @@ public BlockEntity newBlockEntity(@NotNull final BlockPos blockPos, @NotNull fin
     @Override
     public void setPlacedBy(final Level worldIn, final @NotNull BlockPos pos, @NotNull BlockState state, @Nullable LivingEntity placer, @NotNull ItemStack stack)
     {
-        if (worldIn.isClientSide) return;
+        if (worldIn.isClientSide)
+        {
+            return;
+        }
 
         BlockEntity te = worldIn.getBlockEntity(pos);
-        if (te instanceof TileEntityColonyFlag && ((TileEntityColonyFlag) te).colonyId == -1 )
+        if (te instanceof TileEntityColonyFlag flagTileEntity)
         {
             IColony colony = IColonyManager.getInstance().getIColony(worldIn, pos);
 
             // Allow the player to place their own beyond the colony
             if (colony == null && placer instanceof Player)
+            {
                 colony = IColonyManager.getInstance().getIColonyByOwner(worldIn, (Player) placer);
+            }
 
             if (colony != null)
-                ((TileEntityColonyFlag) te).colonyId = colony.getID();
+            {
+                flagTileEntity.colonyId = colony.getID();
+            }
         }
-
     }
 
     @NotNull