From d248a9c9b8430f1be34d69e3bb3ca2392fbb3e29 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 07:31:28 +0100 Subject: Make particles last longer again?! --- src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java b/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java index 8983857119..3bcb1e799b 100644 --- a/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java +++ b/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java @@ -21,7 +21,7 @@ public class BlockHint extends EntityFX { prevPosY = posY; prevPosZ = posZ; noClip = true; - particleMaxAge = 200 + TecTech.Rnd.nextInt(200); + particleMaxAge = 2000 + TecTech.Rnd.nextInt(200); for (int i = 0; i < 6; i++) icons[i] = block.getIcon(i, meta); } -- cgit From ddd327e6b10b03cf701f508c52559220b2d64f3e Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 09:49:11 +0100 Subject: Scanning of elemental matter works. --- .../core/cElementalInstanceStackMap.java | 6 + .../core/stacks/cElementalInstanceStack.java | 4 +- .../definitions/complex/atom/dAtomDefinition.java | 2 +- .../technus/tectech/thing/CustomItemList.java | 4 +- .../item/ElementalDefinitionScanStorage_EM.java | 7 +- .../tectech/thing/item/ParametrizerMemoryCard.java | 2 + .../multi/GT_MetaTileEntity_EM_scanner.java | 165 ++++++++++++++++++--- 7 files changed, 161 insertions(+), 29 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java index ee8a81dbd1..40bf975a17 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java @@ -453,6 +453,12 @@ public final class cElementalInstanceStackMap implements Comparable map=this.map; + this.map=new TreeMap<>(); + return new cElementalInstanceStackMap(map); + } + public void cleanUp(){ for(Map.Entry entry:map.entrySet()){ if(entry.getValue().amount<=0) map.remove(entry.getKey()); diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java index e9de353597..3c5e94121b 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java @@ -323,7 +323,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { lines.add("ENERGY LEVEL = "+energy); if(Util.areBitsSet(SCAN_GET_AMOUNT,capabilities)) lines.add("AMOUNT = "+amount); - lines.add(null);//def separator + lines.add("");//def separator scanContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels); } @@ -336,7 +336,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { definition.addScanResults(lines,detailsOnDepthLevels[depth],energy); if(Util.areBitsSet(SCAN_GET_AMOUNT,detailsOnDepthLevels[depth])) lines.add("AMOUNT = "+definitionStack.amount); - lines.add(null);//def separator + lines.add("");//def separator scanContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels); } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java index 75aabe9af3..bfb024ef50 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java @@ -1431,7 +1431,7 @@ public final class dAtomDefinition extends cElementalDefinition { lines.add(getColor()<0?"NOT COLORED":"CARRIES COLOR"); if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) lines.add("MASS = "+getMass()+" eV/c\u00b2"); - if(iaeaDefinitionExistsAndHasEnergyLevels){ + if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){ for(int i=1;i 0) { + if (totalComputationRemaining > 0) { eRecipe = null; if (objectResearched != null) { if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { @@ -169,7 +189,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa if (eRecipe == null) { quantumStuff(false); objectResearched = null; - computationRequired = computationRemaining = 0; + eRequiredData=0; + totalComputationRequired = totalComputationRemaining = 0; mMaxProgresstime = 0; mEfficiencyIncrease = 0; } else quantumStuff(true); @@ -185,6 +206,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa if(ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) { GT_Recipe scannerRecipe=null; for(cElementalInstanceStack stackEM:researchEM.values()){ + objectsScanned=null; eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.definition); if(eRecipe!=null) { scannerRecipe=eRecipe.scannerRecipe; @@ -207,8 +229,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa researchEM.remove(stackEM.definition); } if(eRecipe!=null && scannerRecipe!=null){//make sure it werks - computationRequired = computationRemaining = scannerRecipe.mDuration * 20L; - mMaxProgresstime = 20; + totalComputationRequired = totalComputationRemaining = scannerRecipe.mDuration * 20L; + mMaxProgresstime = 20;//const mEfficiencyIncrease = 10000; eRequiredData = (short) (scannerRecipe.mSpecialValue >>> 16); eAmpereFlow = (short) (scannerRecipe.mSpecialValue & 0xFFFF); @@ -216,26 +238,119 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa quantumStuff(true); return true; } - }//else{ - //todo implement molecular in depth info scan - //} + }else if(CustomItemList.scanContainer.isStackEqual(itemStack, false, true)) { + eRecipe=null; + if(researchEM.hasStacks()) { + objectsScanned = researchEM.takeAll(); + cleanMassEM_EM(objectsScanned.getMass()); + + totalComputationRequired =0; + eRequiredData=0; + eAmpereFlow=objectsScanned.size() + TecTech.Rnd.next(objectsScanned.size()); + mEUt=-(int)V[8]; + + //get depth scan complexity array + { + int[] scanComplexityTemp = new int[20]; + for (int i = 0; i < 10; i++) { + scanComplexityTemp[i] = getParameterInInt(i, 0); + scanComplexityTemp[i + 10] = getParameterInInt(i, 1); + } + int maxDepth = 0; + for (int i = 0; i < 20; i++) { + if (scanComplexityTemp[i] == SCAN_DO_NOTHING) continue; + else { + maxDepth = i; + if(!DEBUG_MODE) scanComplexityTemp[i]&=~SCAN_GET_CLASS_TYPE; + addComputationRequirements(i+1,scanComplexityTemp[i]); + } + } + maxDepth+=1;//from index to len + scanComplexity = new int[maxDepth]; + System.arraycopy(scanComplexityTemp,0,scanComplexity,0,maxDepth); + } + + totalComputationRemaining = totalComputationRequired; + mMaxProgresstime = 20;//const + mEfficiencyIncrease = 10000; + quantumStuff(true); + return true; + } + } } quantumStuff(false); objectResearched=null; - computationRequired=computationRemaining=0; + totalComputationRemaining =0; mMaxProgresstime=0; mEfficiencyIncrease = 0; return false; } + private void addComputationRequirements(int depthPlus, int capabilities){ + if(Util.areBitsSet(SCAN_GET_NOMENCLATURE,capabilities)){ + totalComputationRequired +=depthPlus*5; + eRequiredData+=depthPlus; + } + if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,capabilities)){ + totalComputationRequired +=depthPlus*10; + eRequiredData+=depthPlus; + + } + if(Util.areBitsSet(SCAN_GET_AMOUNT,capabilities)){ + totalComputationRequired +=depthPlus*64; + eRequiredData+=depthPlus*8; + + } + if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)){ + totalComputationRequired +=depthPlus*128; + eRequiredData+=depthPlus*4; + + } + if(Util.areBitsSet(SCAN_GET_MASS,capabilities)){ + totalComputationRequired +=depthPlus*256; + eRequiredData+=depthPlus*4; + + } + if(Util.areBitsSet(SCAN_GET_ENERGY_LEVEL,capabilities)){ + totalComputationRequired +=depthPlus*512; + eRequiredData+=depthPlus*16; + + } + if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO,capabilities)){ + totalComputationRequired +=depthPlus*1024; + eRequiredData+=depthPlus*32; + + } + if(Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){ + totalComputationRequired +=depthPlus*2048; + eRequiredData+=depthPlus*32; + + } + if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)){ + totalComputationRequired +=depthPlus*1024; + eRequiredData+=depthPlus*48; + + } + if(Util.areBitsSet(SCAN_GET_AGE,capabilities)){ + totalComputationRequired +=depthPlus*2048; + eRequiredData+=depthPlus*64; + + } + if(Util.areBitsSet(SCAN_GET_TIMESPAN_MULT,capabilities)){ + totalComputationRequired +=depthPlus*2048; + eRequiredData+=depthPlus*64; + + } + } + @Override public boolean onRunningTick(ItemStack aStack) { - if(computationRemaining<=0) { - computationRemaining=0; + if(totalComputationRemaining <=0) { + totalComputationRemaining =0; mProgresstime=mMaxProgresstime; return true; }else{ - computationRemaining-=eAvailableData; + totalComputationRemaining -=eAvailableData; mProgresstime=1; return super.onRunningTick(aStack); } @@ -251,10 +366,12 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa tNBT.setString("eMachineType", machineType); tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT()); tNBT.setString("author", EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + ' ' + machineType+ " EM Recipe Generator"); + }else if(objectsScanned!=null && CustomItemList.scanContainer.isStackEqual(mInventory[1], false, true)){ + ElementalDefinitionScanStorage_EM.setContent(mInventory[1],objectsScanned,scanComplexity); } quantumStuff(false); objectResearched=null; - computationRequired=computationRemaining=0; + totalComputationRemaining =0; } @Override @@ -292,10 +409,10 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa " Efficiency: " + EnumChatFormatting.YELLOW + Float.toString(mEfficiency / 100.0F) + EnumChatFormatting.RESET + " %", "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid, - "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET, + "Computation Available: " + EnumChatFormatting.GREEN + eAvailableData +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET, "Computation Remaining:", - EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " + - EnumChatFormatting.YELLOW + Long.toString(computationRequired / 20L) + EnumChatFormatting.GREEN + Long.toString(totalComputationRemaining / 20L) + EnumChatFormatting.RESET + " / " + + EnumChatFormatting.YELLOW + Long.toString(totalComputationRequired / 20L) }; } @@ -308,7 +425,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void stopMachine() { super.stopMachine(); - computationRequired=computationRemaining=0; + totalComputationRequired = totalComputationRemaining =0; objectResearched=null; quantumStuff(false); -- cgit From 01a6d1ea0e0acf1a146d7c462c18ab61904f9f72 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 09:56:00 +0100 Subject: Refactor text --- .../hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java | 10 +++++----- .../metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java index 1a9a811538..2d1400ecf4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java @@ -91,8 +91,8 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ return new String[]{ CommonValues.TEC_MARK_EM, mDescription, - "Mass capacity: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c^2", - "Disposal Speed: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c^2)/s", + "Mass capacity: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c\u00b2", + "Disposal Speed: " + EnumChatFormatting.AQUA + String.format(java.util.Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c\u00b2)/s", "DO NOT OBSTRUCT THE OUTPUT!" }; } @@ -197,9 +197,9 @@ public class GT_MetaTileEntity_Hatch_MufflerElemental extends GT_MetaTileEntity_ public String[] getInfoData() { return new String[]{ "Contained mass:", - EnumChatFormatting.RED + Double.toString(overflowMatter) + EnumChatFormatting.RESET + " eV/c^2 /", - EnumChatFormatting.GREEN + Double.toString(overflowMax) + EnumChatFormatting.RESET + " eV/c^2", - "Mass Disposal speed: " + EnumChatFormatting.BLUE + Double.toString(overflowDisperse) + EnumChatFormatting.RESET + " (eV/c^2)/s" + EnumChatFormatting.RED + Double.toString(overflowMatter) + EnumChatFormatting.RESET + " eV/c\u00b2 /", + EnumChatFormatting.GREEN + Double.toString(overflowMax) + EnumChatFormatting.RESET + " eV/c\u00b2", + "Mass Disposal speed: " + EnumChatFormatting.BLUE + Double.toString(overflowDisperse) + EnumChatFormatting.RESET + " (eV/c\u00b2)/s" }; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index 6f79722ea6..6c25fb3173 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -195,7 +195,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch { return new String[]{ CommonValues.TEC_MARK_GENERAL, mDescription, - EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "E=mine*craft^2" + EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "E=mine*craft\u00b2" }; } -- cgit From fa1d0c65a18f0b38af7f7d049f74c3d9e37c8669 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 10:03:12 +0100 Subject: Fix it --- .../multi/GT_MetaTileEntity_EM_scanner.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index ee93b7df98..e34d690732 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -171,18 +171,16 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa @Override public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) { if(aBaseMetaTileEntity.isServerSide()) { - if (totalComputationRemaining > 0) { + if (totalComputationRemaining > 0 && objectResearched!=null) { eRecipe = null; - if (objectResearched != null) { - if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { - eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition); + if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) { + eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition); + if (eRecipe != null) { + machineType = machine; + } else { + eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.definition); if (eRecipe != null) { - machineType = machine; - } else { - eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.definition); - if (eRecipe != null) { - machineType = crafter; - } + machineType = crafter; } } } -- cgit From f60dcb0bc36cc0bc8e7d7cae3fc3da881569d3a4 Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 11:43:09 +0100 Subject: Minor fixes --- .../elementalMatter/definitions/complex/atom/iaeaNuclide.java | 8 ++++++-- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java index 5c4c10f86d..d9717b33b3 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java @@ -95,7 +95,10 @@ public final class iaeaNuclide { String[] parts = Util.splitButDifferent(rows[0][16], "|"); double Mass=doubleOrNaN(parts[0],"mass"); - if(Mass!=Double.NaN) mass = (float)(Mass*MICRO_AMU_TO_EV_DIV_C_C); + if(!Double.isNaN(Mass)) { + //System.out.println("Mass =\t" + Mass+"\t"+(N+Z)+"\t"+N+"\t"+Z+"\t"+(Mass/(N+Z))); + mass = (float)(Mass*MICRO_AMU_TO_EV_DIV_C_C); + } else mass=Float.NaN; discovery=(short)doubleOrNaN(rows[0][18],"discovery"); @@ -128,7 +131,8 @@ public final class iaeaNuclide { if(s.length()>0) { try { double value=Double.parseDouble(s); - return value != 0 ?value:Float.NaN; + if(Double.isNaN(value)) return Double.NaN; + return value != 0 ?value:Double.NaN; } catch (Exception e) { System.out.println("Invalid Value " + name + " " + N + " " + Z + " " + s); e.printStackTrace(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index e34d690732..efe9f54cd6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -256,8 +256,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } int maxDepth = 0; for (int i = 0; i < 20; i++) { - if (scanComplexityTemp[i] == SCAN_DO_NOTHING) continue; - else { + if (scanComplexityTemp[i] != SCAN_DO_NOTHING) { maxDepth = i; if(!DEBUG_MODE) scanComplexityTemp[i]&=~SCAN_GET_CLASS_TYPE; addComputationRequirements(i+1,scanComplexityTemp[i]); @@ -268,7 +267,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa System.arraycopy(scanComplexityTemp,0,scanComplexity,0,maxDepth); } - totalComputationRemaining = totalComputationRequired; + totalComputationRemaining = totalComputationRequired*=20; mMaxProgresstime = 20;//const mEfficiencyIncrease = 10000; quantumStuff(true); -- cgit From c33cef24763d894071db51a24118464e333113ef Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 12:01:04 +0100 Subject: refactor var name --- .../multi/GT_MetaTileEntity_EM_essentiaDequantizer.java | 2 +- .../metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java | 4 ++-- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java | 2 +- .../thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 4 ++-- .../multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index 2162f81ab5..903729149a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -101,7 +101,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { container=essentiaContainerCompat.getContainer(this); if (eInputHatches.size() < 1 || container==null) { stopMachine(); diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java index 350b918ba8..c1007ac36a 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -110,7 +110,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { container=essentiaContainerCompat.getContainer(this); cElementalInstanceStack newStack=essentiaContainerCompat.getFromContainer(container); if(newStack!=null){ diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java index e8edf9f307..4db4c1096a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java @@ -94,11 +94,11 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { eAvailableData = 0; maxCurrentTemp = 0; double overClockRatio,overVoltageRatio; - if (noParametrizers) { + if (noParametrizationHatches) { overVoltageRatio=overClockRatio=1; } else { overClockRatio= getParameterIn(0,0); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java index a8473b7525..b3f56a5bf5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java @@ -111,7 +111,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { cElementalInstanceStackMap map= getInputsClone_EM(); if(map!=null && map.hasStacks() && map.getFirst().getLifeTime()< STABLE_RAW_LIFE_TIME){ return startRecipe(map.getFirst()); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java index 80e5d4aab2..8afa9b099c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java @@ -83,7 +83,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) { cElementalInstanceStackMap map = in.getContainerHandler(); for (cElementalInstanceStack stack : map.values()) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java index 4115a93910..7789bfe213 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java @@ -92,7 +92,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { if (itemStack != null && itemStack.stackSize == 1) { Item ofThis = itemStack.getItem(); if (ofThis instanceof IElectricItem) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java index 044b7177e3..7a178a692f 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java @@ -104,7 +104,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) if (in.getContainerHandler().hasStacks()) { mEUt = -(int) V[8]; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java index 4f90191c07..a5fe6d11c3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java @@ -92,7 +92,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) {//TODO implement by item quantization, implement instance quantization + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) {//TODO implement by item quantization, implement instance quantization if (GregTech_API.sPostloadFinished) { ItemStack[] inI = getStoredInputs().toArray(new ItemStack[0]); if (inI.length > 0) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index 382ab68609..4dfb4f7b6c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -177,7 +177,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { tRecipe=null; aRecipe=null; if(eHolders.size()>0 && eHolders.get(0).mInventory[0]!=null) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java index efe9f54cd6..c458f8d7f6 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java @@ -197,7 +197,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { eRecipe=null; if(eInputHatches.size()>0 && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) { cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContainerHandler(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index bfd2ffd3fe..9a16035d49 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -80,7 +80,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { short thingsActive = 0; for (GT_MetaTileEntity_Hatch_InputData di : eInputData) if (di.q != null) diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 4bb1e6de3b..1f7f0a6f2e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -112,7 +112,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { if (ePowerPass) { mEfficiencyIncrease = 10000; mMaxProgresstime = 20; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index b5ad2429e9..cb131a6622 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -155,9 +155,9 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock } @Override - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { hasBeenPausedThisCycle =false; - if(noParametrizers){ + if(noParametrizationHatches){ powerSetting=POWER_SETTING_DEFAULT; timerSetting=TIMER_SETTING_DEFAULT; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 93197b504e..c955466138 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -103,7 +103,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt //if you want to add checks that run periodically when machine works then make onRunningTick better //if you want to add checks that run periodically when machine is built then use check params - public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizers) { + public boolean checkRecipe_EM(ItemStack itemStack, boolean noParametrizationHatches) { return false; } // My code handles AMPS, if you want overclocking just modify mEUt and mMaxProgressTime, leave amps as usual! -- cgit From 8ebd281d44469789890ebc94c41d68037679fa2e Mon Sep 17 00:00:00 2001 From: Technus Date: Sun, 17 Dec 2017 22:34:26 +0100 Subject: Display Works --- .../java/com/github/technus/tectech/TecTech.java | 4 + .../technus/tectech/loader/ModGuiHandler.java | 27 +++++ .../item/ElementalDefinitionScanStorage_EM.java | 39 ++++++-- .../tectech/thing/item/gui/ScanDisplayScreen.java | 110 +++++++++++++++++++++ 4 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/github/technus/tectech/loader/ModGuiHandler.java create mode 100644 src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index df45b6585a..59c68e4aab 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -3,6 +3,7 @@ package com.github.technus.tectech; import com.github.technus.tectech.auxiliary.Reference; import com.github.technus.tectech.auxiliary.TecTechConfig; import com.github.technus.tectech.loader.MainLoader; +import com.github.technus.tectech.loader.ModGuiHandler; import com.github.technus.tectech.proxy.CommonProxy; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -10,6 +11,7 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import eu.usrv.yamcore.auxiliary.IngameErrorLog; @@ -81,6 +83,8 @@ public class TecTech { GTCustomLoader.load(); + + NetworkRegistry.INSTANCE.registerGuiHandler(instance, new ModGuiHandler()); proxy.registerRenderInfo(); } diff --git a/src/main/java/com/github/technus/tectech/loader/ModGuiHandler.java b/src/main/java/com/github/technus/tectech/loader/ModGuiHandler.java new file mode 100644 index 0000000000..5a3ca7a877 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/loader/ModGuiHandler.java @@ -0,0 +1,27 @@ +package com.github.technus.tectech.loader; + +import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen; +import cpw.mods.fml.common.network.IGuiHandler; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; + +/** + * Created by danie_000 on 17.12.2017. + */ +public class ModGuiHandler implements IGuiHandler { + public static final int SCAN_DISPLAY_SCREEN_ID =0; + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + return null; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { + switch (ID){ + case SCAN_DISPLAY_SCREEN_ID: + return new ScanDisplayScreen(player); + default: return null; + } + } +} diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java index a64a639c11..3b307fb081 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java @@ -4,17 +4,20 @@ import com.github.technus.tectech.CommonValues; import com.github.technus.tectech.TecTech; import com.github.technus.tectech.Util; import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap; +import com.github.technus.tectech.loader.ModGuiHandler; import com.github.technus.tectech.thing.CustomItemList; +import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.init.Items; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; +import net.minecraft.world.World; import java.util.Collections; import java.util.List; @@ -53,16 +56,22 @@ public class ElementalDefinitionScanStorage_EM extends Item { return; } + public static String[] getLines(ItemStack containerItem){ + if(containerItem.stackTagCompound!=null && containerItem.stackTagCompound.hasKey("elementalInfo")) + return Util.infoFromNBT(containerItem.stackTagCompound.getCompoundTag("elementalInfo")); + return null; + } + @Override public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) { aList.add(CommonValues.TEC_MARK_EM); try { if (aStack.stackTagCompound != null && aStack.stackTagCompound.hasKey("elementalInfo")) { aList.add("Contains scan result"); - if(DEBUG_MODE) { - aList.add("DEBUG MODE INFO - U CHEATER"); - Collections.addAll(aList, Util.infoFromNBT(aStack.stackTagCompound.getCompoundTag("elementalInfo"))); - } + //if(DEBUG_MODE) { + // aList.add("DEBUG MODE INFO - U CHEATER"); + // Collections.addAll(aList, Util.infoFromNBT(aStack.stackTagCompound.getCompoundTag("elementalInfo"))); + //} } else { aList.add("Storage for matter scan data"); } @@ -92,9 +101,27 @@ public class ElementalDefinitionScanStorage_EM extends Item { return offline; } + @Override + public IIcon getIcon(ItemStack itemStack, int pass) { + NBTTagCompound tagCompound=itemStack.stackTagCompound; + if(tagCompound!=null && tagCompound.hasKey("elementalInfo")) + return online; + return offline; + } + @Override public void getSubItems(Item item, CreativeTabs tab, List list) { ItemStack that = new ItemStack(this, 1); list.add(that); } + + @Override + public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) { + if(world.isRemote){ + NBTTagCompound tagCompound=itemStack.stackTagCompound; + if(tagCompound!=null && tagCompound.hasKey("elementalInfo")) + player.openGui(TecTech.instance, ModGuiHandler.SCAN_DISPLAY_SCREEN_ID,world,0,0,0); + } + return itemStack; + } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java new file mode 100644 index 0000000000..e7d3122872 --- /dev/null +++ b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java @@ -0,0 +1,110 @@ +package com.github.technus.tectech.thing.item.gui; + +import com.github.technus.tectech.TecTech; +import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; + +/** + * Created by danie_000 on 17.12.2017. + */ +public class ScanDisplayScreen extends GuiScreen { + private static final int sizeX=240,sizeY=220; + private int baseX,baseY; + private Button up,down,pgUp,pgDown; + private String[] lines; + private int firstLine =0; + + private static final ResourceLocation BACKGROUND =new ResourceLocation("tectech:textures/gui/scanDisplayScreen.png"); + private static final ResourceLocation ITEM =new ResourceLocation("tectech:textures/gui/scanDisplayItem.png"); + + public ScanDisplayScreen(EntityPlayer player){ + super(); + lines= ElementalDefinitionScanStorage_EM.getLines(player.getHeldItem()); + } + + @Override + public void drawScreen(int x, int y, float partialTicks) { + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + this.mc.getTextureManager().bindTexture(ITEM); + long tick=System.currentTimeMillis()/150; + int itick=(int)(tick%12); + drawTexturedModalRect(baseX+99,baseY+189,32*(itick/6),32*(itick%6), 32, 32); + this.mc.getTextureManager().bindTexture(BACKGROUND); + drawTexturedModalRect(baseX,baseY,0,0, sizeX, sizeY); + glDisable(GL_BLEND); + super.drawScreen(x,y,partialTicks); + + int textBaseX=baseX+20; + int textBaseY=baseY+20; + + for(int i=firstLine;i lines.length - 8) firstLine = lines.length - 8; + if (firstLine < 0) firstLine = 0; + } + + private class Button extends GuiButton{ + int u,v; + Button(int id,int x,int y,int u,int v){ + super(id,x,y,20,20,""); + this.u=u; + this.v=v; + } + + @Override + public void drawButton(Minecraft mc, int xPos, int yPos) + { + if (this.visible) + { + this.field_146123_n = xPos >= this.xPosition && yPos >= this.yPosition && xPos < this.xPosition + this.width && yPos < this.yPosition + this.height; + mc.getTextureManager().bindTexture(BACKGROUND); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + mc.getTextureManager().bindTexture(BACKGROUND); + drawTexturedModalRect(this.xPosition, this.yPosition, u + this.getHoverState(this.field_146123_n) * 80, v, this.width, this.height); + glDisable(GL_BLEND); + GL11.glEnable(GL11.GL_BLEND); + } + } + } +} -- cgit From 04289a3c7317e2ddb9391f8cbc9f8c2f7a9ce1ff Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 18 Dec 2017 04:56:17 +0100 Subject: Attempt fix for bloody asp GT5u --- .../java/com/github/technus/tectech/TecTech.java | 2 -- .../technus/tectech/loader/BloodyRecipeLoader.java | 20 ++++++++++---------- .../technus/tectech/loader/ElementalLoader.java | 2 +- .../github/technus/tectech/loader/ThingsLoader.java | 7 +++++++ .../github/technus/tectech/proxy/ClientProxy.java | 8 -------- .../github/technus/tectech/proxy/CommonProxy.java | 2 -- .../item/ElementalDefinitionScanStorage_EM.java | 7 ++----- .../tectech/thing/item/gui/ScanDisplayScreen.java | 1 - .../multi/GT_MetaTileEntity_EM_infuser.java | 2 +- .../multi/GT_MetaTileEntity_EM_scanner.java | 4 +--- .../multi/GT_MetaTileEntity_EM_transformer.java | 2 +- .../multi/GT_MetaTileEntity_TM_microwave.java | 2 +- .../multi/base/GT_Container_MultiMachineEM.java | 1 - 13 files changed, 24 insertions(+), 36 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 59c68e4aab..adcaccdcb1 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -69,8 +69,6 @@ public class TecTech { Module_AdminErrorLogs = new IngameErrorLog(); } - proxy.addTexturePage(tectechTexturePage1); - GTCustomLoader = new MainLoader(); TecTech.Logger.info("Added Atom Overrider"); diff --git a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java index 783f508454..52c584d788 100644 --- a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java @@ -37,7 +37,7 @@ public class BloodyRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ ItemList.Circuit_Parts_GlassFiber.get(8, o), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8) - }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1, o), 200, 30720, true); + }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1, o), 200, 30720); //endregion @@ -77,7 +77,7 @@ public class BloodyRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4) - }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1, o), 200, 122880, true); + }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1, o), 200, 122880); //Molecular Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -126,14 +126,14 @@ public class BloodyRecipeLoader implements Runnable { ItemList.Hatch_Input_Bus_LuV.get(1, o), ItemList.Circuit_Crystalcomputer.get(1, o), CustomItemList.DATApipe.get(2, o) - }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1, o), 200, 122880, true); + }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1, o), 200, 122880); //Data Output GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Computer_Casing.get(1, o), ItemList.Hatch_Output_Bus_LuV.get(1, o), ItemList.Circuit_Crystalcomputer.get(1, o), CustomItemList.DATApipe.get(2, o) - }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1, o), 200, 122880, true); + }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1, o), 200, 122880); //Rack GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -141,7 +141,7 @@ public class BloodyRecipeLoader implements Runnable { ItemList.Hatch_Input_Bus_ZPM.get(1, o), ItemList.Circuit_Crystalc