20.6: Rearrange more packages and add fun loot capacitor names.

src/api/java/com/enderio/api/travel/TravelTargetApi.java

@@ -9,7 +9,6 @@
 import java.util.stream.Stream;
 
 public interface TravelTargetApi {
-
     TravelTargetApi INSTANCE = ServiceLoader.load(TravelTargetApi.class).findFirst().orElseThrow();
 
     Optional<TravelTarget> get(Level level, BlockPos pos);

src/conduits/java/com/enderio/conduits/client/model/ConduitBlockModel.java

@@ -3,7 +3,7 @@
 import com.enderio.api.conduit.ConduitType;
 import com.enderio.api.conduit.ExtendedConduitData;
 import com.enderio.api.misc.RedstoneControl;
-import com.enderio.base.client.model.PaintingQuadTransformer;
+import com.enderio.base.client.paint.model.PaintingQuadTransformer;
 import com.enderio.conduits.common.Area;
 import com.enderio.conduits.common.blockentity.ConduitBlockEntity;
 import com.enderio.conduits.common.blockentity.ConduitBundle;

src/conduits/java/com/enderio/conduits/common/ConduitApiImpl.java

@@ -8,7 +8,6 @@
 
 import java.util.function.Supplier;
 
-// TODO: Maybe use service location for the TravelTargetAPI.
 public class ConduitApiImpl implements ConduitApi {
 
     @Override

src/conduits/java/com/enderio/conduits/common/types/energy/EnergyConduitTicker.java

@@ -29,7 +29,7 @@ public void tickGraph(ConduitType<?> type, List<NodeIdentifier<?>> loadedNodes,
         super.tickGraph(type, loadedNodes, level, graph, isRedstoneActive);
         for (NodeIdentifier<?> node : loadedNodes) {
             EnergyExtendedData energyExtendedData = node.getExtendedConduitData().castTo(EnergyExtendedData.class);
-            IEnergyStorage energy = energyExtendedData.getSelfCap(); //TODO throw on null?
+            IEnergyStorage energy = energyExtendedData.getSelfCap();
             if (energy.getEnergyStored() == 0) {
                 energyExtendedData.setCapacity(500);
                 continue;

src/conduits/java/com/enderio/conduits/common/types/energy/EnergyConduitType.java

@@ -27,14 +27,11 @@ public EnergyConduitType() {
 
     @Override
     public ConduitConnectionData getDefaultConnection(Level level, BlockPos pos, Direction direction) {
-//        BlockEntity blockEntity = level.getBlockEntity(pos.relative(direction));
-//        if (blockEntity != null) { TODO: NEO-PORT: non be caps
-            IEnergyStorage capability = level.getCapability(Capabilities.EnergyStorage.BLOCK, pos.relative(direction), direction.getOpposite());
-            if (capability != null) {
-                return new ConduitConnectionData(capability.canReceive(), capability.canExtract(), RedstoneControl.ALWAYS_ACTIVE);
-
-            }
-//        }
+        IEnergyStorage capability = level.getCapability(Capabilities.EnergyStorage.BLOCK, pos.relative(direction), direction.getOpposite());
+        if (capability != null) {
+            return new ConduitConnectionData(capability.canReceive(), capability.canExtract(), RedstoneControl.ALWAYS_ACTIVE);
+        }
+
         return super.getDefaultConnection(level, pos, direction);
     }
 

src/core/java/com/enderio/core/common/recipes/CountedIngredient.java

@@ -17,8 +17,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-// TODO: Javadocs
-
 /**
  * An ingredient with an item count associated with it.
  */

src/machines/java/com/enderio/machines/common/init/MachineBlocks.java

@@ -1,7 +1,7 @@
 package com.enderio.machines.common.init;
 
 import com.enderio.EnderIO;
-import com.enderio.base.client.renderer.PaintedBlockColor;
+import com.enderio.base.client.paint.PaintedBlockColor;
 import com.enderio.base.common.init.EIOCreativeTabs;
 import com.enderio.base.common.init.EIODataComponents;
 import com.enderio.base.common.paint.item.PaintedBlockItem;

src/main/java/com/enderio/base/client/ClientSetup.java

@@ -1,12 +1,12 @@
 package com.enderio.base.client;
 
 import com.enderio.EnderIO;
-import com.enderio.base.client.model.PaintedBlockGeometry;
+import com.enderio.base.client.paint.model.PaintedBlockGeometry;
 import com.enderio.base.client.particle.RangeParticle;
 import com.enderio.base.client.renderer.block.EnderSkullRenderer;
 import com.enderio.base.client.renderer.glider.ActiveGliderRenderLayer;
-import com.enderio.base.client.renderer.item.GlassIconDecorator;
-import com.enderio.base.client.renderer.travel.TravelTargetRendering;
+import com.enderio.base.client.decorator.GlassIconDecorator;
+import com.enderio.base.client.travel.TravelTargetRendering;
 import com.enderio.base.common.block.skull.EnderSkullBlock;
 import com.enderio.base.common.init.EIOBlockEntities;
 import com.enderio.base.common.init.EIOBlocks;

src/main/java/com/enderio/base/client/renderer/item/GlassIconDecorator.java → src/main/java/com/enderio/base/client/decorator/GlassIconDecorator.java

@@ -1,4 +1,4 @@
-package com.enderio.base.client.renderer.item;
+package com.enderio.base.client.decorator;
 
 import com.enderio.api.misc.Vector2i;
 import com.enderio.base.common.block.glass.FusedQuartzBlock;

src/main/java/com/enderio/base/client/renderer/item/package-info.java → src/main/java/com/enderio/base/client/decorator/package-info.java

@@ -1,4 +1,4 @@
 @javax.annotation.ParametersAreNonnullByDefault
 @net.minecraft.MethodsReturnNonnullByDefault
 
-package com.enderio.base.client.renderer.item;
+package com.enderio.base.client.decorator;

src/main/java/com/enderio/base/client/gui/screen/CoordinateMenuScreen.java

@@ -2,6 +2,7 @@
 
 import com.enderio.EnderIO;
 import com.enderio.api.misc.Vector2i;
+import com.enderio.base.common.lang.EIOLang;
 import com.enderio.base.common.menu.CoordinateMenu;
 import com.enderio.base.common.network.UpdateCoordinateSelectionNameMenuPacket;
 import com.enderio.core.client.gui.screen.EIOScreen;
@@ -26,6 +27,7 @@ public CoordinateMenuScreen(CoordinateMenu pMenu, Inventory pPlayerInventory, Co
     @Override
     protected void init() {
         super.init();
+
         EditBox name = new EditBox(this.font, leftPos + 43 + 4, topPos + 20 + 4, 92 - 12, 18, Component.literal("name"));
         name.setCanLoseFocus(false);
         name.setTextColor(0xFFFFFFFF);
@@ -34,11 +36,12 @@ protected void init() {
         name.setMaxLength(50);
         name.setResponder(this::onNameChanged);
         name.setValue(menu.getName());
+
         this.addRenderableWidget(name);
         this.setInitialFocus(name);
         name.setEditable(true);
-        // TODO: Translation string
-        this.addRenderableWidget(new Button.Builder(Component.literal("Ok"), mouseButton -> Minecraft.getInstance().player.closeContainer())
+
+        this.addRenderableWidget(new Button.Builder(EIOLang.OK, mouseButton -> Minecraft.getInstance().player.closeContainer())
             .bounds(getGuiLeft() + imageWidth - 30, getGuiTop() + imageHeight - 30, 20, 20)
             .build());
     }
@@ -68,7 +71,6 @@ protected Vector2i getBackgroundImageSize() {
         return BG_SIZE;
     }
 
-
     private void onNameChanged(String name) {
         PacketDistributor.sendToServer(new UpdateCoordinateSelectionNameMenuPacket(getMenu().containerId, name));
     }

src/main/java/com/enderio/base/client/renderer/PaintedBlockColor.java → src/main/java/com/enderio/base/client/paint/PaintedBlockColor.java

@@ -1,8 +1,7 @@
-package com.enderio.base.client.renderer;
+package com.enderio.base.client.paint;
 
 import com.enderio.base.common.paint.block.PaintedBlock;
 import com.enderio.base.common.paint.block.PaintedSlabBlock;
-import com.enderio.base.common.paint.blockentity.DoublePaintedBlockEntity;
 import com.enderio.base.common.paint.blockentity.PaintedBlockEntity;
 import com.enderio.base.common.init.EIODataComponents;
 import net.minecraft.client.Minecraft;
@@ -12,7 +11,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.Nullable;

src/main/java/com/enderio/base/client/renderer/entity/PaintedSandRenderer.java → src/main/java/com/enderio/base/client/paint/PaintedSandRenderer.java

@@ -1,4 +1,4 @@
-package com.enderio.base.client.renderer.entity;
+package com.enderio.base.client.paint;
 
 import com.enderio.base.common.paint.PaintedSandEntity;
 import com.mojang.blaze3d.vertex.PoseStack;

src/main/java/com/enderio/base/client/model/PaintedBlockGeometry.java → src/main/java/com/enderio/base/client/paint/model/PaintedBlockGeometry.java

@@ -1,4 +1,4 @@
-package com.enderio.base.client.model;
+package com.enderio.base.client.paint.model;
 
 import com.enderio.base.common.paint.PaintUtils;
 import com.google.gson.JsonDeserializationContext;

src/main/java/com/enderio/base/client/model/PaintedBlockModel.java → src/main/java/com/enderio/base/client/paint/model/PaintedBlockModel.java

@@ -1,6 +1,6 @@
-package com.enderio.base.client.model;
+package com.enderio.base.client.paint.model;
 
-import com.enderio.base.client.renderer.PaintedBlockColor;
+import com.enderio.base.client.paint.PaintedBlockColor;
 import com.enderio.base.common.init.EIODataComponents;
 import com.enderio.base.common.paint.blockentity.DoublePaintedBlockEntity;
 import com.enderio.base.common.paint.blockentity.PaintedBlockEntity;

src/main/java/com/enderio/base/client/model/PaintingQuadTransformer.java → src/main/java/com/enderio/base/client/paint/model/PaintingQuadTransformer.java

@@ -1,4 +1,4 @@
-package com.enderio.base.client.model;
+package com.enderio.base.client.paint.model;
 
 import com.enderio.core.client.RenderUtil;
 import com.enderio.core.data.model.ModelHelper;

src/main/java/com/enderio/base/client/renderer/travel/TravelParticleHandler.java → src/main/java/com/enderio/base/client/travel/TravelParticleHandler.java

@@ -1,4 +1,4 @@
-package com.enderio.base.client.renderer.travel;
+package com.enderio.base.client.travel;
 
 import com.enderio.base.common.handler.TravelHandler;
 import net.minecraft.client.Minecraft;
@@ -31,7 +31,6 @@ public static void clientTick(ClientTickEvent.Post e) {
         }
     }
 
-
     private static void addTravelParticle(Vec3 pos) {
         int time = tick/3%20;
         float x = Mth.sin((float)(time*Math.PI)/10f);

src/main/java/com/enderio/base/client/renderer/travel/TravelTargetRendering.java → src/main/java/com/enderio/base/client/travel/TravelTargetRendering.java

@@ -1,4 +1,4 @@
-package com.enderio.base.client.renderer.travel;
+package com.enderio.base.client.travel;
 
 import com.enderio.api.travel.RegisterTravelRenderersEvent;
 import com.enderio.api.travel.TravelRenderer;

src/main/java/com/enderio/base/client/model/package-info.java → src/main/java/com/enderio/base/client/travel/package-info.java

@@ -1,4 +1,4 @@
 @javax.annotation.ParametersAreNonnullByDefault
 @net.minecraft.MethodsReturnNonnullByDefault
 
-package com.enderio.base.client.model;
+package com.enderio.base.client.travel;

src/main/java/com/enderio/base/common/init/EIOBlocks.java

@@ -1,7 +1,7 @@
 package com.enderio.base.common.init;
 
 import com.enderio.EnderIO;
-import com.enderio.base.client.renderer.PaintedBlockColor;
+import com.enderio.base.client.paint.PaintedBlockColor;
 import com.enderio.base.common.block.ColdFireBlock;
 import com.enderio.base.common.block.DarkSteelLadderBlock;
 import com.enderio.base.common.block.EIOPressurePlateBlock;

src/main/java/com/enderio/base/common/init/EIOCriterions.java

@@ -1,7 +1,7 @@
 package com.enderio.base.common.init;
 
 import com.enderio.EnderIO;
-import com.enderio.base.common.advancement.PaintingTrigger;
+import com.enderio.base.common.paint.PaintingTrigger;
 import com.enderio.base.common.advancement.UseGliderTrigger;
 import net.minecraft.advancements.CriterionTrigger;
 import net.minecraft.core.registries.Registries;

src/main/java/com/enderio/base/common/init/EIOEntities.java

@@ -1,7 +1,7 @@
 package com.enderio.base.common.init;
 
 import com.enderio.EnderIO;
-import com.enderio.base.client.renderer.entity.PaintedSandRenderer;
+import com.enderio.base.client.paint.PaintedSandRenderer;
 import com.enderio.base.common.paint.PaintedSandEntity;
 import com.enderio.regilite.holder.RegiliteEntity;
 import com.enderio.regilite.registry.EntityRegistry;

src/main/java/com/enderio/base/common/init/EIOItems.java

@@ -4,6 +4,7 @@
 import com.enderio.api.capacitor.CapacitorData;
 import com.enderio.api.grindingball.GrindingBallData;
 import com.enderio.base.common.item.capacitors.CapacitorItem;
+import com.enderio.base.common.item.capacitors.LootCapacitorItem;
 import com.enderio.base.common.item.misc.BrokenSpawnerItem;
 import com.enderio.base.common.item.misc.CreativeTabIconItem;
 import com.enderio.base.common.item.misc.EnderiosItem;
@@ -101,14 +102,14 @@ public class EIOItems {
     public static final RegiliteItem<CapacitorItem> BASIC_CAPACITOR = ITEM_REGISTRY
         .registerItem("basic_capacitor",
             props -> new CapacitorItem(
-                props.component(EIODataComponents.CAPACITOR_DATA, CapacitorData.simple(1.0f))),
+                props.component(EIODataComponents.CAPACITOR_DATA, CapacitorData.simple(1))),
             new Item.Properties().stacksTo(1))
         .setTab(EIOCreativeTabs.MAIN);
 
     public static final RegiliteItem<CapacitorItem> DOUBLE_LAYER_CAPACITOR = ITEM_REGISTRY
         .registerItem("double_layer_capacitor",
             props -> new CapacitorItem(
-                props.component(EIODataComponents.CAPACITOR_DATA, CapacitorData.simple(2.0f))),
+                props.component(EIODataComponents.CAPACITOR_DATA, CapacitorData.simple(2))),
             new Item.Properties().stacksTo(1))
         .setTab(EIOCreativeTabs.MAIN);
 
@@ -119,8 +120,8 @@ public class EIOItems {
             new Item.Properties().stacksTo(1))
         .setTab(EIOCreativeTabs.MAIN);
 
-    public static final RegiliteItem<CapacitorItem> LOOT_CAPACITOR = ITEM_REGISTRY
-        .registerItem("loot_capacitor", CapacitorItem::new, new Item.Properties()
+    public static final RegiliteItem<LootCapacitorItem> LOOT_CAPACITOR = ITEM_REGISTRY
+        .registerItem("loot_capacitor", LootCapacitorItem::new, new Item.Properties()
             .stacksTo(1));
 
     // endregion

src/main/java/com/enderio/base/common/item/capacitors/LootCapacitorItem.java

@@ -0,0 +1,94 @@
+package com.enderio.base.common.item.capacitors;
+
+import com.enderio.api.capacitor.CapacitorData;
+import com.enderio.api.capacitor.CapacitorModifier;
+import com.enderio.base.common.init.EIOAttachments;
+import com.enderio.base.common.init.EIODataComponents;
+import com.enderio.base.common.lang.EIOLang;
+import com.enderio.core.common.util.TooltipUtil;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.item.ItemStack;
+
+public class LootCapacitorItem extends CapacitorItem {
+    public LootCapacitorItem(Properties properties) {
+        super(properties);
+    }
+
+    @Override
+    public Component getName(ItemStack pStack) {
+        var capacitorData = pStack.getOrDefault(EIODataComponents.CAPACITOR_DATA, CapacitorData.NONE);
+
+        if (capacitorData.modifiers().isEmpty()) {
+            return getBaseName(capacitorData);
+        }
+
+        return getModifierQuality(capacitorData)
+            .copy()
+            .append(" ")
+            .append(getModifierType(capacitorData))
+            .append(" ")
+            .append(getBaseName(capacitorData));
+    }
+
+    private MutableComponent getBaseName(CapacitorData capacitorData) {
+        float base = capacitorData.base();
+
+        if (base < 1f) {
+            return EIOLang.LOOT_CAPACITOR_BASE_DUD;
+        } else if (base < 1.5f) {
+            return EIOLang.LOOT_CAPACITOR_BASE_NORMAL;
+        } else if (base < 2.5f) {
+            return EIOLang.LOOT_CAPACITOR_BASE_ENHANCED;
+        } else if (base < 3.5f) {
+            return EIOLang.LOOT_CAPACITOR_BASE_WONDER;
+        }
+
+        return EIOLang.LOOT_CAPACITOR_BASE_IMPOSSIBLE;
+    }
+
+    private MutableComponent getModifierType(CapacitorData capacitorData) {
+        var firstType = capacitorData.modifiers().keySet().stream().findFirst();
+
+        if (firstType.isEmpty()) {
+            throw new IllegalArgumentException();
+        }
+
+        // TODO: Use a map for this instead.
+        if (firstType.get() == CapacitorModifier.ENERGY_CAPACITY) {
+            return EIOLang.LOOT_CAPACITOR_TYPE_ENERGY_CAPACITY;
+        } else if (firstType.get() == CapacitorModifier.ENERGY_USE) {
+            return EIOLang.LOOT_CAPACITOR_TYPE_ENERGY_USE;
+        }
+
+        return EIOLang.LOOT_CAPACITOR_TYPE_UNKNOWN;
+    }
+
+    private MutableComponent getModifierQuality(CapacitorData capacitorData) {
+        var firstModifier = capacitorData.modifiers().values().stream().findFirst();
+
+        if (firstModifier.isEmpty()) {
+            throw new IllegalArgumentException();
+        }
+
+        float modifier = firstModifier.get();
+
+        if (modifier < 1f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_FAILED;
+        } else if (modifier < 1.5f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_SIMPLE;
+        } else if (modifier < 2.5f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_NICE;
+        } else if (modifier < 3f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_GOOD;
+        } else if (modifier < 3.5f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_ENHANCED;
+        } else if (modifier < 4f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_PREMIUM;
+        } else if (modifier < 4.25f) {
+            return EIOLang.LOOT_CAPACITOR_MODIFIER_INCREDIBLY;
+        }
+
+        return EIOLang.LOOT_CAPACITOR_MODIFIER_UNSTABLE;
+    }
+}