Fix typo in es_ar.json

.github/ISSUE_TEMPLATE/issue.yml

@@ -26,7 +26,10 @@ body:
  - "1.17"
  - "1.18"
  - "1.19"
- - "1.20"
+ - "1.20.1"
+ - "1.20.2"
+ - "1.20.3"
+ - "1.21.1"
  validations:
  required: true
  - type: input
@@ -58,4 +61,4 @@ body:
  - label: I am using other mods besides Ice and Fire
  required: false
  - label: I have attached a log file from the session that I have experienced this issue
- required: true
+ required: true

.github/config/labels.yml

@@ -0,0 +1,10 @@
+'1.16':
+ - '1\.16(?:\.\d)?'
+'1.17':
+ - '1\.17(?:\.\d)?'
+'1.18':
+ - '1\.18(?:\.\d)?'
+'1.19':
+ - '1\.19(?:\.\d)?'
+'1.20':
+ - '1\.20(?:\.\d)?'

.github/workflows/label_issues.yml

@@ -0,0 +1,14 @@
+name: "Label Issues"
+on:
+ issues:
+ types: [opened, edited]
+
+jobs:
+ label:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: github/[email protected]
+ with:
+ configuration-path: .github/config/labels.yml
+ enable-versioned-regex: 0
+ repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish_alpha.yml

@@ -10,19 +10,19 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout sources
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 8
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
  with:
- java-version: 8
+ distribution: temurin
+ java-version: 17
+ cache: gradle
  - name: Grant execute permission for gradlew
  run: chmod +x gradlew
  - name: Get date
  run: echo "DATE=$(date --rfc-3339=date)" >> ${GITHUB_ENV}
  - name: Set Version
  run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV}
- - name: Set Minecraft Version
- run: echo "MINECRAFT_VERSION=${GITHUB_REF##*/}" >> ${GITHUB_ENV}
  - name: Build jar
  run: ./gradlew build
  env:
@@ -33,6 +33,6 @@ jobs:
  with:
  repo_token: "${{ secrets.GITHUB_TOKEN }}"
  prerelease: true
- title: Alpha Release ${{env.MINECRAFT_VERSION}}-${{env.RELEASE_VERSION}}
+ title: Alpha Release ${{env.RELEASE_VERSION}}
  files: |
  build/libs/*

.github/workflows/publish_beta.yml

@@ -10,19 +10,19 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout sources
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 8
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
  with:
- java-version: 8
+ distribution: temurin
+ java-version: 17
+ cache: gradle
  - name: Grant execute permission for gradlew
  run: chmod +x gradlew
  - name: Get date
  run: echo "DATE=$(date --rfc-3339=date)" >> ${GITHUB_ENV}
  - name: Set Version
  run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV}
- - name: Set Minecraft Version
- run: echo "MINECRAFT_VERSION=${GITHUB_REF##*/}" >> ${GITHUB_ENV}
  - name: Build jar
  run: ./gradlew build
  env:
@@ -33,6 +33,6 @@ jobs:
  with:
  repo_token: "${{ secrets.GITHUB_TOKEN }}"
  prerelease: true
- title: Beta Release ${{env.MINECRAFT_VERSION}}-${{env.RELEASE_VERSION}}
+ title: Beta Release ${{env.RELEASE_VERSION}}
  files: |
  build/libs/*

.github/workflows/publish_snapshot.yml

@@ -7,11 +7,13 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout sources
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Set up JDK 8
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
  with:
- java-version: 8
+ distribution: temurin
+ java-version: 17
+ cache: gradle
  - name: Grant execute permission for gradlew
  run: chmod +x gradlew
  - name: Get date

build.gradle

@@ -42,12 +42,20 @@ repositories {
 def build_snapshot = System.getenv("BUILD_SNAPSHOT") == "true"
 def build_id = System.getenv("BUILD_ID")
 
-version = '2.1.12-1.18.2'
+version = '2.1.13-1.18.2'
 
 if (build_snapshot) {
  version += '-SNAPSHOT'
 }
 if (build_id != null) {
+ // get last two parts of build id
+ def split = build_id.split('-')
+ if (split.length >= 2) {
+ def build_id_last = split[split.length - 1]
+ def build_id_second = split[split.length - 2]
+ build_id = build_id_second + "-" + build_id_last
+ }
+
  version += "+build.${build_id}"
 }
 
@@ -153,7 +161,7 @@ jar {
  attributes([
  "Specification-Title": "iceandfire",
  "Specification-Vendor": "alexthe667",
- "Specification-Version": "2.1.11", // We are version 1 of ourselves
+ "Specification-Version": "2.1.13", // We are version 1 of ourselves
  "Implementation-Title": project.name,
  "Implementation-Version": "${version}",
  "Implementation-Vendor" :"alexthe667",

src/main/java/com/github/alexthe666/iceandfire/IceAndFire.java

@@ -3,7 +3,6 @@
 import com.github.alexthe666.iceandfire.block.IafBlockRegistry;
 import com.github.alexthe666.iceandfire.client.ClientProxy;
 import com.github.alexthe666.iceandfire.config.ConfigHolder;
-import com.github.alexthe666.iceandfire.datagen.DataGenerators;
 import com.github.alexthe666.iceandfire.entity.IafEntityRegistry;
 import com.github.alexthe666.iceandfire.entity.IafVillagerRegistry;
 import com.github.alexthe666.iceandfire.entity.tile.IafTileEntityRegistry;
@@ -13,6 +12,7 @@
 import com.github.alexthe666.iceandfire.message.*;
 import com.github.alexthe666.iceandfire.recipe.IafRecipeRegistry;
 import com.github.alexthe666.iceandfire.recipe.IafRecipeSerializers;
+import com.github.alexthe666.iceandfire.world.IafPlacementFilterRegistry;
 import com.github.alexthe666.iceandfire.world.IafProcessors;
 import com.github.alexthe666.iceandfire.world.IafWorldRegistry;
 import net.minecraft.core.Registry;
@@ -83,9 +83,7 @@ public class IceAndFire {
  channel = channel.clientAcceptedVersions(version::equals);
  version = PROTOCOL_VERSION;
  version.getClass();
- NETWORK_WRAPPER = channel.serverAcceptedVersions(version::equals).networkProtocolVersion(() -> {
- return PROTOCOL_VERSION;
- }).simpleChannel();
+ NETWORK_WRAPPER = channel.serverAcceptedVersions(version::equals).networkProtocolVersion(() -> PROTOCOL_VERSION).simpleChannel();
  }
 
  public IceAndFire() {
@@ -115,10 +113,12 @@ public IceAndFire() {
  IafBlockRegistry.BLOCKS.register(modBus);
  IafEntityRegistry.ENTITIES.register(modBus);
  IafTileEntityRegistry.TYPES.register(modBus);
+ IafPlacementFilterRegistry.PLACEMENT_MODIFIER_TYPES.register(modBus);
  IafWorldRegistry.FEATURES.register(modBus);
  IafWorldRegistry.STRUCTURES.register(modBus);
  IafContainerRegistry.CONTAINERS.register(modBus);
  IafRecipeSerializers.SERIALIZERS.register(modBus);
+ IafRecipeRegistry.RECIPE_TYPE.register(modBus);
  IafProcessors.PROCESSORS.register(modBus);
 
  IafVillagerRegistry.POI_TYPES.register(modBus);
@@ -213,9 +213,7 @@ private void setup(final FMLCommonSetupEvent event) {
  }
 
  private void setupClient(final FMLClientSetupEvent event) {
- event.enqueueWork(() -> {
- PROXY.clientInit();
- });
+ event.enqueueWork(() -> PROXY.clientInit());
  }
 
  private void setupComplete(final FMLLoadCompleteEvent event) {

src/main/java/com/github/alexthe666/iceandfire/client/gui/GuiDragonForge.java

@@ -65,7 +65,7 @@ private int getCookTime(int p_175381_1_) {
  int j = 0;
 
  List<DragonForgeRecipe> recipes = this.getMinecraft().level.getRecipeManager()
- .getAllRecipesFor(IafRecipeRegistry.DRAGON_FORGE_TYPE)
+ .getAllRecipesFor(IafRecipeRegistry.DRAGON_FORGE_TYPE.get())
  .stream().filter(item ->
  item.isValidInput(tileFurnace.getSlot(0).getItem()) && item.isValidBlood(tileFurnace.getSlot(1).getItem())).collect(Collectors.toList());
  int maxCookTime = recipes.isEmpty() ? 100 : recipes.get(0).getCookTime();

src/main/java/com/github/alexthe666/iceandfire/client/gui/bestiary/GuiBestiary.java

@@ -87,6 +87,8 @@ private static Item getItemByRegistryName(String registryName) {
  @Override
  protected void init() {
  super.init();
+ this.clearWidgets();
+ this.indexButtons.clear();
  int centerX = (width - X) / 2;
  int centerY = (height - Y) / 2;
  this.previousPage = new ChangePageButton(centerX + 15, centerY + 215, false, 0, (p_214132_1_) -> {

src/main/java/com/github/alexthe666/iceandfire/client/model/IFChainBuffer.java

@@ -170,8 +170,8 @@ public void calculateChainFlapBufferHead(float maxAngle, int bufferTime, float a
  this.prevYawVariation = this.yawVariation;
 
  if (!compareDouble(entity.yHeadRotO, entity.yHeadRot) && Mth.abs(this.yawVariation) < maxAngle) {
- this.yawVariation += Mth.clamp((entity.yHeadRot - entity.yHeadRotO) / divisor, -maxAngle, maxAngle);
- if (entity instanceof IFlapable && Math.abs(entity.yHeadRot - entity.yHeadRotO) > 15D) {
+ this.yawVariation += Mth.clamp((entity.yHeadRotO - entity.yHeadRot) / divisor, -maxAngle, maxAngle);
+ if (entity instanceof IFlapable && Math.abs(entity.yHeadRotO - entity.yHeadRot) > 15D) {
  ((IFlapable) entity).flapWings();
  }
  }

src/main/java/com/github/alexthe666/iceandfire/compat/jei/IceAndFireJEIPlugin.java

@@ -37,7 +37,7 @@ private void addDescription(IRecipeRegistration registry, ItemStack itemStack) {
 
  @Override
  public void registerRecipes(IRecipeRegistration registry) {
- List<DragonForgeRecipe> forgeRecipeList = Minecraft.getInstance().level.getRecipeManager().getAllRecipesFor(IafRecipeRegistry.DRAGON_FORGE_TYPE);
+ List<DragonForgeRecipe> forgeRecipeList = Minecraft.getInstance().level.getRecipeManager().getAllRecipesFor(IafRecipeRegistry.DRAGON_FORGE_TYPE.get());
 
  List<DragonForgeRecipe> fire = forgeRecipeList.stream().filter(item -> item.getDragonType().equals("fire")).collect(Collectors.toList());
  List<DragonForgeRecipe> ice = forgeRecipeList.stream().filter(item -> item.getDragonType().equals("ice")).collect(Collectors.toList());