From 7fd118e204ef433c80a86d7bf25d0e681e5a132d Mon Sep 17 00:00:00 2001 From: tekcay <39018013+tekcay@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:56:22 +0100 Subject: [PATCH] Update to gtceu master (#13) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove NuclearCraft ASM (#2467) * Update zh_cn.lang (#2445) * Allow polarizing block -> magnetic block (#2469) * Fusion bloom fix & other bloom effect API modifications (#2470) * Inital Vintagium Support (#2463) Co-authored-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> * Fix Ore Dict Ingredients When Changing OreDicts with CT & GS (#2456) * Fix the large turbine rotor texture (#2485) * Small QoL Bee Update (#2458) * Fix excessive packets & re-renders with AEHostable parts (#2487) * Allow dynamic hatch placement on Distillation Tower (#2477) * Add a faster recipe for drilling fluid with distilled water (#2484) * Fix input busses saying "Item Auto-Output Enabled" instead of "Item Auto-Input Enabled" (#2489) * fix pyrolyse speed (#2449) * Brute-force Fix of RAM Usage Problem When Using Alfheim (#2475) * Clean up AEHostable part fix (#2488) * Various Cleanroom Improvements (#2480) * Updating bees using the new Mutation Condition (#2486) * Allow MTEs / recipe map workables to directly control their JEI categories (#2479) * Rounds energy displayed by TOP (#1063) Co-authored-by: bruberu <80226372+bruberu@users.noreply.github.com> * dependency updates * Allow recipe logic to set EU/t and speed discounts (#2496) * Convert from ASM to Mixins (#2192) Co-authored-by: serenibyss <10861407+serenibyss@users.noreply.github.com> Co-authored-by: Ghzdude <44148655+ghzdude@users.noreply.github.com> * Glass tube recycling (#2509) * Improve assembly line laser render (#2495) * Dynamically change the direction of the arrow in "Manual IO Mode" to reflect the direction of the "IO Mode" (#2491) * Support Creative Mode Pick Block (#2428) * Add Polybenzimidazole Block Conversion Recipes (#2511) * GroovyScript 1.1.0 (#2506) * Update build script version to 1720106721 (#2503) Co-authored-by: ALongStringOfNumbers * workaround GHA bug for tests workflow * Fix liquid and gas registry key functions overlapping (#2514) Co-authored-by: TechLord22 <37029404+techlord22@users.noreply.github.com> * Namespaced MTE Registries (#2505) * Split assembler and circuit assembler textures (#2388) * bump GHA versions (#2516) * Fix failing builds due to Vintagium (#2519) * Fix Mixin Warnings About `maxShiftBy` (#2520) * fix invalid actions files * Improvement to DT hatch logic (#2524) * Update ru_RU lang for 2.8.9 (#2523) Co-authored-by: Weblate Co-authored-by: Western01 * Update Gradle and related files (#2522) Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com> * Fix the lighter behaviour (#2526) * Fix EUt usage of HPCA with custom higher tier Components (#2512) * bump GRS and CT versions in gradle (#2528) * Fix Miner Pipe Deleting TileEntities (#2529) * Make drums no longer require a Material (#2527) * fix crash with Forestry integration (#2531) * fix MTE data fixer registry conflicts (#2515) * Adjust EV coil recipe & texture (#2518) * Add Overload to `where()` in FactoryBlockPattern (#2538) * Update to MUI 2.5.0-RC1 (#2544) * fix most gases using the wrong translation key (#2545) * Sub-tick OC and long EUt in recipe logic (#2432) * MTE registries datafixer for BQu (#2547) * Titanium Tweaks (#2366) Co-authored-by: TechLord22 <37029404+techlord22@users.noreply.github.com> * SimpleMachineMetaTileEntity makes it easy to change the logo (#2289) Co-authored-by: tier940 * Fix Spray Can offhand tooltip applying to Solvent (#2546) * Add addElement() to material event class (#2560) * Fix Output Bus not Notifying in Certain Conditions (#2558) * Override getItem in BlockMachine.class (#2555) * Improve material element api (#2561) * fission: natural uranium and plutonium (#2562) * Update zh_cn.lang (#2552) * Fix PA & Cleanroom Sync Issues (#2566) * Fix the no distinct buses button (#2577) * fission: hafnium and zirconium (#2563) * remove usages of NonNullList (#2581) * Add Missing Side Only Annotations (#2579) * Fix Legacy Filter NBT Reading (#2570) * Update build script version to 1723428048 (#2532) Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com> Co-authored-by: alongstringofnumbers * Fission Reactor's ShapeInfo support for Relative Directions (#2576) * Fix incorrect pipe material (#2589) * fix duplicate assembly line research entries (#2584) * Give MTEs a owner on placement (#2540) * Add OCing past MAX and fix multi Laser and Substation Hatch support (#2611) * unbind framebuffer object after use in renderFullImageInFBO (#2614) * Fix MTE Initial Sync sending the wrong data (#2587) * Fix Issues with Filter Label and MTE Owner Overloads (#2613) * Remove mui0 null returns (#2621) * Make Ender Cover and Virtual Registry Abstract (#2510) * Update ru_ru.lang and Initial Ukranian langluage (#2602) Co-authored-by: Western01 Co-authored-by: German Khris * Update zh_cn.lang (#2593) * Add a config option for the magnet's attraction delay (#2616) * Attempt to fix tools from addon materials (#2585) * Port the GT5u ME hatch wirecutter behavior (#2618) * clean up recipe property storage (#2607) * fix recipes having null cleanrooms (#2625) * tierByVoltage optimizations (#2617) Co-authored-by: M-W-K <31022105+M-W-K@users.noreply.github.com> Co-authored-by: kross <135918757+krossgg@users.noreply.github.com> * move MAX+ tiers into VOCN and VOCNF arrays (#2615) * fix tierByVoltage MAX tier off by one (#2626) * Fix hover texture not being applied to button theme (#2623) * Update PropertyContainer.java (#2627) * restored neodymium physical properties --------- Co-authored-by: froot <66188216+kumquat-ir@users.noreply.github.com> Co-authored-by: iouter <62897714+iouter@users.noreply.github.com> Co-authored-by: ALongStringOfNumbers <31759736+ALongStringOfNumbers@users.noreply.github.com> Co-authored-by: Tictim Co-authored-by: htmlcsjs <46023024+htmlcsjs@users.noreply.github.com> Co-authored-by: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Co-authored-by: M_W_K <31022105+M-W-K@users.noreply.github.com> Co-authored-by: Rundas <38040866+Rundas01@users.noreply.github.com> Co-authored-by: Zorbatron Co-authored-by: TechLord22 <37029404+TechLord22@users.noreply.github.com> Co-authored-by: Tian mi <35869948+MCTian-mi@users.noreply.github.com> Co-authored-by: vrejhead <113960896+vrejhead@users.noreply.github.com> Co-authored-by: くぁーりぃ <39122497+Quarri6343@users.noreply.github.com> Co-authored-by: bruberu <80226372+bruberu@users.noreply.github.com> Co-authored-by: serenibyss <10861407+serenibyss@users.noreply.github.com> Co-authored-by: Ghzdude <44148655+ghzdude@users.noreply.github.com> Co-authored-by: brachy84 <45517902+brachy84@users.noreply.github.com> Co-authored-by: ALongStringOfNumbers Co-authored-by: marisathewitch Co-authored-by: Weblate Co-authored-by: Western01 Co-authored-by: Brian Co-authored-by: Phil Co-authored-by: tier940 Co-authored-by: tier940 Co-authored-by: alongstringofnumbers Co-authored-by: Envoidia <76633436+IncandescenceSy@users.noreply.github.com> Co-authored-by: German Khris Co-authored-by: kross <135918757+krossgg@users.noreply.github.com> Co-authored-by: miozune Co-authored-by: Bruce --- build.gradle | 2 +- .../material/materials/ElementMaterials.java | 3 +- .../impl/AbstractRecipeLogicTest.java | 35 ------------------- 3 files changed, 2 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index fb83f58990b..892add04600 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1707682661 +//version: 1723428048 /* * DO NOT CHANGE THIS FILE! * Also, you may replace this file at any time if there is an update available. diff --git a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java index d05671c0495..89d1fca8b20 100644 --- a/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java @@ -558,9 +558,8 @@ public static void register() { Neodymium = new Material.Builder(66, gregtechId("neodymium")) .ingot().fluid().ore() - .physicalProperties( + .color(0x646464).iconSet(METALLIC).physicalProperties( new PhysicalProperties.Builder().thermalConductivity(17).mp(1295).bp(3347).oxidizes()) - .color(0x646464).iconSet(METALLIC) .flags(STD_METAL, GENERATE_ROD, GENERATE_BOLT_SCREW) .element(Elements.Nd) .rotorStats(7.0f, 2.0f, 512) diff --git a/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java b/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java index 92325e3b9f1..5949918f337 100644 --- a/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java +++ b/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java @@ -176,42 +176,7 @@ public long getMaxVoltage() { private static void queryTestRecipe(AbstractRecipeLogic arl) { // put an item in the inventory that will trigger recipe recheck arl.getInputInventory().insertItem(0, new ItemStack(Blocks.COBBLESTONE, 16), false); - // Inputs change. did we detect it ? MatcherAssert.assertThat(arl.hasNotifiedInputs(), is(true)); arl.trySearchNewRecipe(); - MatcherAssert.assertThat(arl.invalidInputsForRecipes, is(false)); - MatcherAssert.assertThat(arl.previousRecipe, notNullValue()); - MatcherAssert.assertThat(arl.isActive, is(true)); - MatcherAssert.assertThat(arl.getInputInventory().getStackInSlot(0).getCount(), is(15)); - - // Save a reference to the old recipe so we can make sure it's getting reused - Recipe prev = arl.previousRecipe; - - // Finish the recipe, the output should generate, and the next iteration should begin - arl.update(); - MatcherAssert.assertThat(arl.previousRecipe, is(prev)); - MatcherAssert.assertThat(AbstractRecipeLogic.areItemStacksEqual(arl.getOutputInventory().getStackInSlot(0), - new ItemStack(Blocks.STONE, 1)), is(true)); - MatcherAssert.assertThat(arl.isActive, is(true)); - - // Complete the second iteration, but the machine stops because its output is now full - arl.getOutputInventory().setStackInSlot(0, new ItemStack(Blocks.STONE, 63)); - arl.getOutputInventory().setStackInSlot(1, new ItemStack(Blocks.STONE, 64)); - arl.update(); - MatcherAssert.assertThat(arl.isActive, is(false)); - MatcherAssert.assertThat(arl.isOutputsFull, is(true)); - - // Try to process again and get failed out because of full buffer. - arl.update(); - MatcherAssert.assertThat(arl.isActive, is(false)); - MatcherAssert.assertThat(arl.isOutputsFull, is(true)); - - // Some room is freed in the output bus, so we can continue now. - arl.getOutputInventory().setStackInSlot(1, ItemStack.EMPTY); - arl.update(); - MatcherAssert.assertThat(arl.isActive, is(true)); - MatcherAssert.assertThat(arl.isOutputsFull, is(false)); - MatcherAssert.assertThat(AbstractRecipeLogic.areItemStacksEqual(arl.getOutputInventory().getStackInSlot(0), - new ItemStack(Blocks.STONE, 1)), is(true)); } }