合并拉取请求 #2

* 虚拟油田信息卡

* 添加tooltips

* mixin

* mixin!

* spotless

* spotless

* 优化代码结构，添加材质

* 更新readme

* 减少蒸汽虚空矿机的蒸汽消耗量，削弱虚空矿机的产量

* 虚拟油田定位卡添加配方

* 修复虚拟油田定位卡配方问题

Author: liansishen

README.md

@@ -1,33 +1,49 @@
 ## 关于本模组
-GTNH私货模组  
-为GTNH添加一些机器、物品，使得前期更轻松一些。  
+GTNH私货模组
+
+为GTNH添加一些机器、物品，使得前期更轻松一些。
 
 ## 机器、物品
 * ### 大型焦炉
-  不用再堆焦炉阵列了  
-  搭建4个焦炉所需的焦炉砖即可搭建大型焦炉，提供4并行，加高建筑以提高并行数，最高16并行。  
+  不用再堆焦炉阵列了
+
+  搭建4个焦炉所需的焦炉砖即可搭建大型焦炉，提供4并行，加高建筑以提高并行数，最高16并行。
+
   可以使用原始仓室来实现自动化。
 
 * ### 大型土高炉
-  不用再堆土高炉阵列了  
-  搭建4个土高炉所需的材料即可搭建大型土高炉，提供4并行，加高建筑以提高并行数，最高16并行。  
+  不用再堆土高炉阵列了
+
+  搭建4个土高炉所需的材料即可搭建大型土高炉，提供4并行，加高建筑以提高并行数，最高16并行。
+
   可以使用原始仓室来实现自动化。
 
-* ### 更便宜的虚空矿机(WIP)
-  参考[更便宜的虚空矿机](https://github.com/Jonodonozym/CheaperVoidMiners)，添加原始版本和蒸汽版本。~~JOJO,我不想再挖矿啦~~  
+* ### 更便宜的虚空矿机
+  参考[更便宜的虚空矿机](https://github.com/Jonodonozym/CheaperVoidMiners)，添加原始版本和蒸汽版本。~~JOJO,我不想再挖矿啦~~
+
   移除了采矿管道的需求(~~感谢原始人提供技术支持。~~)
-  * 原始(木制)：2秒(40t)/次，4个粗矿，需要放入可燃物做为燃料
-  * 蒸汽：1秒(20t)/次，4个粗矿，需要通入蒸汽作为燃料(80mb/t)
-  * LV: 0.5秒(10t)/次，2个原矿，32 eu/t
-  * HV: 0.5秒(10t)/次，4个原矿，512 eu/t
-  * IV: 0.5秒(10t)/次，8个原矿，8192 eu/t
+  * 原始(木制)：2秒(40t)/次，2个粗矿，需要放入可燃物做为燃料
+  * 蒸汽：1秒(20t)/次，2个粗矿，需要通入蒸汽作为燃料(20mb/t)
+  * LV: 0.5秒(10t)/次，1个原矿，32 eu/t
+  * HV: 0.5秒(10t)/次，2个原矿，512 eu/t
+  * IV: 0.5秒(10t)/次，4个原矿，8192 eu/t
 
-* ### 原始仓室(WIP)
+* ### 原始仓室
   使用了原始人技术制造出来的仓室。
   * 原始输入总线: 1格，无虚拟电路
   * 原始输出总线: 1格，无自动输出，无过滤
   * 原始输入仓: 8B容量（目前似乎没有使用场景）
   * 原始输出仓: 64B容量，无流体锁定功能
 
+* ### 虚拟油田定位卡
+  在虚拟油田所在区块右键定位卡，会将维度和区块坐标以及所包含的虚拟油田的信息保存至定位卡中。
+
+  在油气矿机的控制器方块物品栏中放入虚拟油田定位卡，油气矿机会直接挖取定位卡上记录的区块内包含的虚拟油田。
+
+* ### 修改多方块矿机(WIP)
+  现在采集虚拟资源(油气、虚空)的多方块矿机都不需要采矿管道了(~~再次感谢原始人提供技术支持。~~)
+
 ## TODO List
+  * [ ] 完善Tooltips
+  * [ ] 蒸汽油气矿机
 

dependencies.gradle

@@ -36,6 +36,7 @@
 dependencies {
     api("com.github.GTNewHorizons:GTNHLib:0.5.11:dev")
     api('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.114:dev')
+    runtimeOnly("com.github.GTNewHorizons:Mixingasm:v0.2.4:dev")
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev")
     implementation('com.github.GTNewHorizons:Railcraft:9.15.15:dev')
     implementation("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }

gradle.properties

@@ -74,21 +74,21 @@ apiPackage =
 accessTransformersFile =
 
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
-usesMixins = false
+usesMixins = true
 
 # Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
 # This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
 # Mixin classes will have access to "main" classes, but not the other way around.
 separateMixinSourceSet =
 
 # Adds some debug arguments like verbose output and class export.
-usesMixinDebug = false
+usesMixinDebug = true
 
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
-mixinsPackage =
+mixinsPackage = mixins
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
 # This parameter is for legacy compatibility only

src/main/java/com/hepdd/easytech/CommonProxy.java

@@ -12,8 +12,8 @@ public class CommonProxy {
     public void preInit(FMLPreInitializationEvent event) {
         Config.synchronizeConfiguration(event.getSuggestedConfigurationFile());
 
-        EasyTechnology.LOG.info(Config.greeting);
-        EasyTechnology.LOG.info("I am EasyTechnology at version " + Tags.VERSION);
+        // EasyTechnology.LOG.info(Config.greeting);
+        // EasyTechnology.LOG.info("I am EasyTechnology at version " + Tags.VERSION);
     }
 
     // load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed)

src/main/java/com/hepdd/easytech/EasyTechnology.java

@@ -3,6 +3,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.hepdd.easytech.loaders.preload.ETHLoaderItem;
 import com.hepdd.easytech.loaders.preload.ETHLoaderMetaTileEntities;
 import com.hepdd.easytech.loaders.preload.ETHLoaderRecipe;
 
@@ -38,6 +39,7 @@ public void preInit(FMLPreInitializationEvent event) {
     public void init(FMLInitializationEvent event) {
         proxy.init(event);
         new ETHLoaderMetaTileEntities().run();
+        new ETHLoaderItem().run();
         new ETHLoaderRecipe().run();
     }
 

src/main/java/com/hepdd/easytech/api/enums/ETHItemList.java

@@ -23,6 +23,8 @@ public enum ETHItemList {
     Hatch_Input_Bus_Primitive,
     Hatch_Output_Bus_Primitive,
 
+    ITEM_Void_Oil_Location_Card,
+
     ;
 
     private boolean mHasNotBeenSet;

src/main/java/com/hepdd/easytech/api/metatileentity/implementations/base/ETHNonConsumMultiBase.java

@@ -74,7 +74,7 @@ public int getMaxEfficiency(ItemStack arg0) {
     public abstract void construct(ItemStack stackSize, boolean hintsOnly);
 
     @Override
-    public abstract IStructureDefinition getStructureDefinition();
+    public abstract IStructureDefinition<T> getStructureDefinition();
 
     @Override
     protected abstract MultiblockTooltipBuilder createTooltip();

src/main/java/com/hepdd/easytech/api/metatileentity/implementations/base/ETHVoidMinerBase.java

@@ -45,7 +45,11 @@
 import com.gtnewhorizons.modularui.api.math.Pos2d;
 import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
-import com.gtnewhorizons.modularui.common.widget.*;
+import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
+import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
+import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
+import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import bwcrossmod.galacticgreg.VoidMinerUtility;
 import gregtech.api.GregTechAPI;
@@ -78,7 +82,12 @@ public abstract class ETHVoidMinerBase extends MTEEnhancedMultiBlockBase<ETHVoid
     private VoidMinerUtility.DropMap dropMap = null;
     private VoidMinerUtility.DropMap extraDropMap = null;
     private float totalWeight;
-    private int multiplier;
+
+    public float getTotalWeight() {
+        return totalWeight;
+    }
+
+    public int multiplier;
     private int oreType;
     private boolean mBlacklist = false;
     private String dimensionName = "";
@@ -89,6 +98,7 @@ public abstract class ETHVoidMinerBase extends MTEEnhancedMultiBlockBase<ETHVoid
     protected boolean mChunkLoadingEnabled = true;
     protected ChunkCoordIntPair mCurrentChunk = null;
     protected boolean mWorkChunkNeedsReload = true;
+    private int xDrill, yDrill, zDrill;
     // private @NotNull String shutdownReason = "";
     protected static final String STRUCTURE_PIECE_MAIN = "main";
     protected static final ClassValue<IStructureDefinition<ETHVoidMinerBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
@@ -160,10 +170,6 @@ public CheckRecipeResult checkProcessing() {
         return SimpleCheckRecipeResult.ofFailure("none");
     }
 
-    public void setMultiplier(int tier) {
-        this.multiplier = tier;
-    }
-
     public void setOreType(int type) {
         this.oreType = type;
     }
@@ -178,7 +184,20 @@ public void setOreType(int type) {
 
     public abstract int getCasingTextureIndex();
 
+    private void updateCoordinates() {
+        xDrill = getBaseMetaTileEntity().getXCoord();
+        yDrill = getBaseMetaTileEntity().getYCoord();
+        zDrill = getBaseMetaTileEntity().getZCoord();
+    }
+
     protected boolean workingAtBottom() {
+
+        if (mWorkChunkNeedsReload) {
+            mCurrentChunk = new ChunkCoordIntPair(xDrill >> 4, zDrill >> 4);
+            GTChunkManager.requestChunkLoad((TileEntity) getBaseMetaTileEntity(), null);
+            mWorkChunkNeedsReload = false;
+        }
+
         // if the dropMap has never been initialised or if the dropMap is empty
         if (this.dropMap == null || this.totalWeight == 0) this.calculateDropMap();
 
@@ -206,6 +225,7 @@ protected boolean workingAtBottom() {
 
     @Override
     public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
+        updateCoordinates();
         return checkPiece(STRUCTURE_PIECE_MAIN, 1, 6, 0) && checkHatches();
     }