aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api
AgeCommit message (Collapse)Author
2018-01-29Merge pull request #196 from codewarrior0/refactor-check-recipeAlkalus
$ Rewrite and refactor checkRecipe() for several multiblocks, restore machine sounds $ Fixes #182. $ Fixes #183. $ Fixes #184.
2018-01-29Fix broken multiblocks - remove hacky `polluteEnvironment()` (#191)David Vierra
This code path should never have worked. `getDeclaredField()` only searches the given class and not any of its superclasses - because `mPollution` is declared in a superclass, `null` will always be returned.
2018-01-28Make sure checkRecipeGeneric() resets the progress time and outputs.David Vierra
Fixes a bug where if an input stack is of the right type but the amount is not enough, proceeds with the last successful recipe.
2018-01-28Rewrite and refactor checkRecipe() for several multiblocks, restore machine ↵David Vierra
sounds `checkRecipeGeneric()` implements parallel processing, EU/t discounts and speed boosts, increased random chances, and can be used to consider each input bus individually (as seen in the Industrial Material Press) to allow each bus to use a different Configuration Circuit. Also considers the voltage input limit of the multiblock when counting recipes to do in parallel - if the energy hatch is too small, it will process fewer recipes at once. Plays the machine's sound, if any, on success. `checkRecipeGeneric()` also checks `canBufferOutput()` and will pause the machine if it has no bus/hatch room for the recipe output. `getValidOutputSlots()` is rewritten as `canBufferOutput()`, which now checks both the item output buses and fluid output hatches to make sure recipe output can be accepted. This is used to pause a machine instead of allowing it to continue working and void outputs, if the outputs can't be stored in a bus and/or hatch. NOTE: `canBufferOutput()` doesn't consider parallel processing, so there are a few recipes where, if done in parallel, it may get a false positive on the buffer check and void some outputs. In practice, this will rarely happen. Removed unused imports, fields, and locals. Industrial Centrifuge now uses `checkRecipeGeneric()` with 4 parallel recipes and a 40% speed boost. Industrial Coke Oven now uses `checkRecipeGeneric()` with 12 parallel recipes if using Heat-Resistant Casings, or 24 if using Heat-Proof Casings. Sound plays while processing. Industrial Cutting Machine now uses `checkRecipeGeneric()` with 2 parallel recipes and a 60% speed boost. Pollution removed since the Machine is built with no Muffler Hatch. Industrial Electrolyzer now uses `checkRecipeGeneric()` with 2 parallel recipes and a 40% speed boost. Maceration Stack now uses `checkRecipeGeneric()` with 8*tTier parallel recipes, a 60% speed boost, and an increased amount (~33%) of random outputs. Sound plays while processing. Material Press now uses `checkRecipeGeneric()` with 2 parallel recipes and a 50% speed boost. Each input bus is considered separately for finding recipes, allowing each bus to hold a different Configuration Circuit. Sound plays while processing. Industrial Sifter now uses `checkRecipeGeneric()` with 2 parallel recipes, a 400% speed boost, and an increased amount (~15%) of random outputs. Changed particles to appear above the sieve grates. Industrial Thermal Centrifuge now uses `checkRecipeGeneric()` with 2 parallel recipes and a 60% speed boost. Industrial Washing Plant now uses `checkRecipeGeneric()` with 2 parallel recipes and an 80% speed boost. Stone Dust outputs are no longer deleted. Wire Factory now uses `checkRecipeGeneric()` with 2 parallel recipes and a 60% speed boost. Sound plays while processing.
2018-01-25$ Further fixes to Pollution and Multiblocks, revision of ↵Jordan Byrne
7ddb7f5e8ed9fe60b730183c7a04f3bce3b8f815. + Added a handler for class transformers. % Added test case to tiered tanks for NBT storing. - Removed logging from some reflection calls.
2018-01-24$ Several 5.08 compat fixes.Jordan Byrne
$ Fixed pollution, which was causing all multiblocks to fail. This was pointed out in #191 by @CodeWarrior0, however I decided to re-do it myself to better handle the .08 compat. $ Fixed all multiblocks being broken as fuck. Fixes #190, fixes #186 and also fixes #176. - Removed some useless logging from the mining explosives.
2018-01-08+ Added a recipe to craft Mining Explosives.Jordan Byrne
+ Added missing file. WorldGen_GT.java. % Tweaked Mining Explosive logic. % Tweaked entity fuse variable in primed mining explosive. % Swapped some XSTR's to CSPRNG's. $ Fixed mining explosives renderer. $ Fixed Tesla Tower attacking Items on the ground.
2017-12-28+ Added 3 new batteries.Jordan Byrne
$ Fixed Circuits so that each one has a valid replacement type. $ Fixed a bug some materials had invalid radiation levels. $ Fixed crushed ore item type textures. + Added recipes for all crushed ore items. + Added processing recipes for all crushed ore items.
2017-12-24+ Added the Tesla Tower for base defence.Jordan Byrne
2017-12-20- Disabled some logging.Draknyte1
% Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper.
2017-12-15More fixes pre-gtnh update (#168)Alkalus
$ Tree Farmer Fix (a) $ Multitank Fix. ^ Version Bump. * + Added Chainsaw support to treefarm. + Added check for creative tools to tree farm for creative testing.
2017-12-15$ Small fix to updateTexture() in GregtechMeta_MultiBlockBase.java.Jordan Byrne
2017-12-15Add TecTech support (#166)Alkalus
+ Added check for TecTech mod. + Added TecTech support to my Base Multiblock. + Added TecTech support to my Power-Substation. + Added TecTech support to my Generator Array. % Made GT++ load after a few more mods that were recently added. $ Fixed else statement for computronics load message during startup. $ By now supporting Multi-amp Dynamos, this closes #161.
2017-12-11Merge GTNH features and changes (#160)Daniel
+ GTNH full compat mode. + Added boiler config, recipes changes and minor tweaks. $ Fix nbtutuls. $ Tree farm fixes. % Pipe and cable rendering tweaks.
2017-12-07+ Added the component assembler. (Makes Motors, Pistons, etc.)Jordan Byrne
% More Nitro work.
2017-11-28- Removed Recipe generation logging.Alkalus
2017-11-27$ 5.08.33 compat.Alkalus
2017-11-27$ Hopefully fixed crash when Thaumcraft wasn't loaded.Alkalus
$ Hopefully fixed crash when Forestry wasn't loaded.
2017-11-27$ Compatibility Fixes.Alkalus
- Removed Ore-Regeneration command.
2017-11-22+ Added the basic framework for Ore Regen commands.Alkalus
+ Added more missing Blast Smelter recipes. $ Fixed Alloy Blast Smelter not using fluids as expected.
2017-11-17+ Gave people free capes.Alkalus
% Redid cape handler. - Removed annoying logging.
2017-11-17+ Added in the Compact Fusion Reactor.Alkalus
% Did work on the CFR. $ Fixed a tooltip on the Pollution Detector.
2017-11-17+ Added the Cutting Factory Multiblock.Alkalus
+ Added a config for the Cutting Factory. % Hid Generator Array Logging.
2017-11-17+ Added the Generator Array.Alkalus
2017-11-15+ Added Wireless Chargers.Alkalus
> These are a basic design-only implementation for reference, so they may never be completed and are more of a proof of concept.
2017-11-15$ Fixed Charge Hatches not having the correct amount of inputs.Alkalus
$ Fixed Charge Hatches correctly handling electric items.
2017-11-15+ Added custom Hatch textures.Alkalus
2017-11-15$ Fixed Power Sub-Station not providing very good scanner info.Alkalus
+ Added stats for nerds to the PSS. + Added custom (dis)charge hatches for use with the PSS.
2017-11-14Revert "% Changed Wash Plant recipe handling."Alkalus
This reverts commit 98d4998aafa2f5b6f1ad518b6effe52b6a7c7c18.
2017-11-14Revert "$ Re-did some recipe handling, several different multi-blocks now ↵Alkalus
give the correct outputs. Fixes #68." This reverts commit 9d7ea595609228d8341c0dc7c9a7461153d764bb. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialCentrifuge.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java
2017-10-07+ Added sounds to more Multi-BlocksAlkalus
$ Made my base Multiblock extend the GT base multi-block.
2017-10-07+ Made Alloy Blast Smelter actually check for a muffler.Alkalus
% Changed Industrial Electrolyzer controller texture. % Changed Large Sifter controller texture. $ Fixed names of custom IC2 cells. $ Fixed the empty item having an invalid texture.
2017-10-06$ .08 compliance fixes.Alkalus
% LFTR Changes. It now outputs U233 on average every 10 seconds. % Updated LFTR tool-tip.
2017-10-05+ Added a custom recipe handler for the Advanced Combiner.Alkalus
+ Added a Combined recipe for the HG-1223 Super Conductor. % Slight tweak to material generator.
2017-10-05+ Added Advanced Mixers, which can mix 4 inputs with up to 4 outputs.Alkalus
2017-10-05+ Added some wires from custom materials.Alkalus
+ Added a new Super Conductor Material for LuV power (HG-1223). + Added recipes for all custom material wires and cables. $ Fixed an issue where materials with a bad RGB array would crash the game.
2017-10-05$ Fixed the Wire/Cable colouring not working properly when placed. Closes #133.Alkalus
2017-10-05$ Hopefully fixed my custom cables/wires not having correct colours. Thanks ↵Alkalus
to @Technus for the suggestion.
2017-09-26% Changed Blast Smelter Recipe addition again. Input fluids should now be ↵Alkalus
supported. > This allows more alloys requiring oxygen or argon to be produced.
2017-09-24+ Added 3 tiers of GT Semi-Fluid generators.Alkalus
2017-09-19+ Added a Cyclotron Recipe handler & a test recipe.Alkalus
% Changed Cyclotron Tool-tip. % Made Cyclotron IV. % Changed Cyclotron controller texture.
2017-09-19$ Fixed Cable/Pipe tool-tips.Alkalus
2017-09-19$ Re-did some recipe handling, several different multi-blocks now give the ↵Alkalus
correct outputs. Fixes #68.
2017-09-19% Changed Wash Plant recipe handling.Alkalus
2017-09-18$ Potential fix to custom cables not rendering properly.Alkalus
2017-09-17+ Added Large Ore Washing Plant.Alkalus
+ Added Red-Steel casing. + More additions to Thermal Centrifuge. + Added Wash-Plant and Large Thermal Centrifuge casings. % Refactored config option 'enableMachine_ThermalBoiler' to be 'enableMultiblock_ThermalBoiler'.
2017-09-17$ Fixed an issue where Multi-block recipe changes affected the actual GT ↵Alkalus
recipes. % Updated tooltips to reflect time bonuses.
2017-09-14+ Added recipes for Vanadium Redox Power Cells.Alkalus
2017-09-09$ GT5.08.33 compliance fixes.Alkalus
2017-09-09- Removed Superconductors and Conduction Nodes.Alkalus