datagen and spotless

Author: MarbleGateKeeper

CHANGELOG.md

@@ -6,4 +6,7 @@
 * Add proper dispenser behavior to bucket of Experience
 
 ### Fix
-* fix Grindstone Drain destroys items when break
+* fix Grindstone Drain destroys items when break
+
+### Translation
+* Update Russian Translation by Karbin Drem

src/generated/resources/assets/create_enchantment_industry/lang/ru_ru.json

@@ -1,5 +1,4 @@
 {
-  "_comment.unlocalized": "Remove this line after finishing localization.",
   "advancement.create_enchantment_industry.a_shower_experience": "沐浴“经验”",
   "advancement.create_enchantment_industry.a_shower_experience.desc": "打破管道，沐浴在经验之中\n§7（隐藏进度）",
   "advancement.create_enchantment_industry.assembly_aesthetics": "视觉产线",
@@ -225,7 +224,7 @@
   "create_enchantment_industry.recipe.printing.copy.template": "可复制的内容",
   "create_enchantment_industry.recipe.printing.custom_name.base": "接受任意物品",
   "create_enchantment_industry.recipe.printing.custom_name.template": "自定义名称",
-  "death.attack.create_enchantment_industry.grind": "Mechanical Grindstone blew out %1$s's hand.",
+  "death.attack.create_enchantment_industry.grind": "动力砂轮压爆了%1$s的手。",
   "fluid.create_enchantment_industry.experience": "液态经验",
   "item.create_enchantment_industry.enchanting_template": "附魔模板",
   "item.create_enchantment_industry.experience_bucket": "附魔之桶",

src/generated/resources/assets/create_enchantment_industry/lang/zh_cn.json

@@ -23,7 +23,6 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
 import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
-import com.simibubi.create.foundation.fluid.FluidRenderer;
 import dev.engine_room.flywheel.lib.model.baked.PartialModel;
 import net.createmod.catnip.platform.NeoForgeCatnipServices;
 import net.createmod.catnip.render.CachedBuffers;

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/PrinterRenderer.java

@@ -1,8 +1,29 @@
+/*
+ * Copyright (C) 2025  DragonsPlus
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package plus.dragons.createenchantmentindustry.common.fluids.printer.behaviour;
 
 import com.mojang.serialization.DataResult;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.utility.CreateLang;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
@@ -21,11 +42,7 @@
 import plus.dragons.createenchantmentindustry.config.CEIConfig;
 import plus.dragons.createenchantmentindustry.util.CEILang;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public class BannerPatternPrintingBehavior implements PrintingBehaviour{
+public class BannerPatternPrintingBehavior implements PrintingBehaviour {
     private final SmartFluidTankBehaviour tank;
     private final Holder<BannerPattern> pattern;
 
@@ -40,7 +57,7 @@ public static Optional<DataResult<PrintingBehaviour>> create(Level level, SmartF
         BannerPatternLayers layers = stack.get(DataComponents.BANNER_PATTERNS);
         if (layers.layers().isEmpty())
             return Optional.of(DataResult.error(() -> CEICommon.asLocalization("gui.printer.banner_pattern.no_pattern")));
-        if (layers.layers().size()>1)
+        if (layers.layers().size() > 1)
             return Optional.of(DataResult.error(() -> CEICommon.asLocalization("gui.printer.banner_pattern.multiple_pattern")));
         return Optional.of(DataResult.success(new BannerPatternPrintingBehavior(tank, layers.layers().getFirst().pattern())));
     }
@@ -61,15 +78,15 @@ public int getRequiredItemCount(Level level, ItemStack stack) {
     @Override
     public int getRequiredFluidAmount(Level level, ItemStack stack, FluidStack fluidStack) {
         var cost = fluidStack.getFluidHolder().getData(CEIDataMaps.PRINTING_BANNER_PATTERN_INGREDIENT);
-        return cost == null? 0 : cost;
+        return cost == null ? 0 : cost;
     }
 
     @Override
     public ItemStack getResult(Level level, ItemStack stack, FluidStack fluidStack) {
         BannerPatternLayers layers = stack.get(DataComponents.BANNER_PATTERNS);
         ArrayList<BannerPatternLayers.Layer> l = new ArrayList<>();
         l.addAll(layers.layers());
-        l.add(new BannerPatternLayers.Layer(pattern,((DyeFluidType)fluidStack.getFluidType()).getColor()));
+        l.add(new BannerPatternLayers.Layer(pattern, ((DyeFluidType) fluidStack.getFluidType()).getColor()));
         var result = stack.copy();
         result.set(DataComponents.BANNER_PATTERNS, new BannerPatternLayers(l));
         return result;
@@ -81,7 +98,6 @@ public void onFinished(Level level, BlockPos pos, PrinterBlockEntity printer) {
         level.levelEvent(1043, pos.below(), 0);
     }
 
-
     @Override
     public boolean isSafeNBT() {
         return false;
@@ -91,18 +107,17 @@ public boolean isSafeNBT() {
     public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
         CEILang.translate("gui.goggles.printing.banner_pattern").forGoggles(tooltip);
         var amount = tank.getPrimaryHandler().getFluid().getFluidHolder().getData(CEIDataMaps.PRINTING_BANNER_PATTERN_INGREDIENT);
-        if (amount != null){
-            var p = Component.literal("→ ").append(Component.translatable(pattern.value().translationKey() + "." + ((DyeFluidType)tank.getPrimaryHandler().getFluid().getFluidType()).getColor().getName())).withStyle(ChatFormatting.GOLD);
+        if (amount != null) {
+            var p = Component.literal("→ ").append(Component.translatable(pattern.value().translationKey() + "." + ((DyeFluidType) tank.getPrimaryHandler().getFluid().getFluidType()).getColor().getName())).withStyle(ChatFormatting.GOLD);
             CEILang.builder().add(p).forGoggles(tooltip, 1);
             CEILang.translate("gui.goggles.printing.cost",
-                            CEILang.number(amount)
-                                    .add(CreateLang.translate("generic.unit.millibuckets"))
-                                    .style(amount <= CEIConfig.fluids().printerFluidCapacity.get()
-                                            ? ChatFormatting.GREEN
-                                            : ChatFormatting.RED))
+                    CEILang.number(amount)
+                            .add(CreateLang.translate("generic.unit.millibuckets"))
+                            .style(amount <= CEIConfig.fluids().printerFluidCapacity.get()
+                                    ? ChatFormatting.GREEN
+                                    : ChatFormatting.RED))
                     .forGoggles(tooltip, 1);
-        }
-        else if (!tank.getPrimaryHandler().getFluid().isEmpty()) {
+        } else if (!tank.getPrimaryHandler().getFluid().isEmpty()) {
             CEILang.translate("gui.goggles.printing.incorrect_liquid").style(ChatFormatting.RED).forGoggles(tooltip);
         }
         return true;

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/behaviour/BannerPatternPrintingBehavior.java

@@ -59,13 +59,12 @@ public static Optional<DataResult<PrintingBehaviour>> create(Level level, SmartF
     @Override
     public int getRequiredItemCount(Level level, ItemStack stack) {
         var name = getCustomName(tank.getPrimaryHandler().getFluid());
-        if (CEIConfig.fluids().printingCustomNameAsItemName.get()){
+        if (CEIConfig.fluids().printingCustomNameAsItemName.get()) {
             var n = stack.get(DataComponents.ITEM_NAME);
-            if(n!=null && n.equals(name)) return 0;
-        }
-        else{
+            if (n != null && n.equals(name)) return 0;
+        } else {
             var n = stack.get(DataComponents.CUSTOM_NAME);
-            if(n!=null && n.equals(name)) return 0;
+            if (n != null && n.equals(name)) return 0;
         }
         return 1;
     }
@@ -80,10 +79,9 @@ public int getRequiredFluidAmount(Level level, ItemStack stack, FluidStack fluid
     public ItemStack getResult(Level level, ItemStack stack, FluidStack fluidStack) {
         var result = stack.copy();
         var name = getCustomName(fluidStack);
-        if (CEIConfig.fluids().printingCustomNameAsItemName.get()){
+        if (CEIConfig.fluids().printingCustomNameAsItemName.get()) {
             result.set(DataComponents.ITEM_NAME, name);
-        }
-        else{
+        } else {
             result.set(DataComponents.CUSTOM_NAME, name);
         }
         return result;

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/behaviour/CustomNamePrintingBehaviour.java

@@ -73,8 +73,7 @@ private EnchantedBookPrintingBehaviour(Level level, SmartFluidTankBehaviour tank
             if (customCost != null) {
                 optional = customCost.stream().filter(pair -> pair.level() == entry.getIntValue()).findFirst();
             }
-            result.addAndGet(optional.map(CEIIntIntPair::value).orElseGet(() ->
-                    (int) (CEIEnchantmentHelper.getEnchantmentCost(entry.getKey(), entry.getIntValue()) * CEIConfig.fluids().printingEnchantedBookCostMultiplier.get())));
+            result.addAndGet(optional.map(CEIIntIntPair::value).orElseGet(() -> (int) (CEIEnchantmentHelper.getEnchantmentCost(entry.getKey(), entry.getIntValue()) * CEIConfig.fluids().printingEnchantedBookCostMultiplier.get())));
         });
         this.cost = result.get();
     }

src/main/java/plus/dragons/createenchantmentindustry/common/fluids/printer/behaviour/EnchantedBookPrintingBehaviour.java

@@ -88,7 +88,7 @@ public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
 
             @Override
             public ItemStack extractItem(int slot, int amount, boolean simulate) {
-                if(slot == 3000){ // IMPORTANT: 3000 is for internal usage for extract item in Processing inventory. Normally it won't be call by any other circumstances
+                if (slot == 3000) { // IMPORTANT: 3000 is for internal usage for extract item in Processing inventory. Normally it won't be call by any other circumstances
                     var result = getStackInSlot(0);
                     clear();
                     return result;
@@ -320,7 +320,7 @@ protected void read(CompoundTag compound, HolderLookup.Provider registries, bool
     public void destroy() {
         super.destroy();
         Containers.dropItemStack(level, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), processedItem);
-        Containers.dropItemStack(level, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), inventory.extractItem(3000,64,false));
+        Containers.dropItemStack(level, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), inventory.extractItem(3000, 64, false));
     }
 
     @Override

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainBlockEntity.java

@@ -25,7 +25,6 @@
 import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
 import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
-import com.simibubi.create.foundation.fluid.FluidRenderer;
 import dev.engine_room.flywheel.lib.transform.TransformStack;
 import net.createmod.catnip.platform.NeoForgeCatnipServices;
 import net.minecraft.client.Minecraft;

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainRenderer.java

@@ -100,7 +100,7 @@ public static int getExperienceFromGrindingRecipe(Level level, ItemStack stack)
             grinding = level.getRecipeManager().getRecipeFor(CEIRecipes.GRINDING.getType(), input, level);
         if (grinding.isEmpty()) return 0;
         var f = grinding.get().value().getFluidResults();
-        if(f.isEmpty()) return 0;
+        if (f.isEmpty()) return 0;
         return f.getFirst().getAmount();
     }