Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downscaled crop blocks to 16x and follow up on brother PR #80

Closed
wants to merge 7 commits into from
Closed

Downscaled crop blocks to 16x and follow up on brother PR #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e983807
Downscaled clop blocks to 16x and follow up on brother PR
BlueHero233 Oct 16, 2024
fe7532d
Merge branch 'master' into scanner-textures
Dream-Master Oct 21, 2024
27b3223
Update CropWeedPicker.java
BlueHero233 Oct 30, 2024
7307f08
Merge branch 'master' into scanner-textures
BlueHero233 Oct 30, 2024
109b413
Merge branch 'master' into scanner-textures
Dream-Master Nov 16, 2024
d572079
Merge branch 'master' into scanner-textures
BlueHero233 Nov 16, 2024
cb73109
Merge branch 'master' into scanner-textures
Dream-Master Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 38 additions & 33 deletions src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropGeneExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
package com.github.bartimaeusnek.cropspp.GTHandler.machines;

import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_GLOW;

import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
Expand All @@ -30,6 +13,7 @@
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GTUITextures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -58,29 +42,50 @@ public CropGeneExtractor(int aID, String aName, String aNameRegional, int aTier)
1,
1,
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_GLOW).glow().build()));
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_GLOW"))
.glow().build()));
}

public CropGeneExtractor(String mName, byte mTier, String[] mDescriptionArray, ITexture[][][] mTextures) {
Expand Down
71 changes: 38 additions & 33 deletions src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropReplicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
package com.github.bartimaeusnek.cropspp.GTHandler.machines;

import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_GLOW;

import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
Expand All @@ -31,6 +14,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GTUITextures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand All @@ -57,29 +41,50 @@ public CropReplicator(int aID, String aName, String aNameRegional, int aTier) {
2,
2,
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_GLOW).glow().build()));
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_GLOW"))
.glow().build()));
}

public CropReplicator(String mName, byte mTier, String[] mDescriptionArray, ITexture[][][] mTextures) {
Expand Down
71 changes: 38 additions & 33 deletions src/main/java/com/github/bartimaeusnek/cropspp/GTHandler/machines/CropSynthesiser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,5 @@
package com.github.bartimaeusnek.cropspp.GTHandler.machines;

import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_SCANNER_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_ACTIVE_GLOW;
import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_SCANNER_GLOW;

import java.util.HashMap;

import net.minecraft.item.ItemStack;
Expand All @@ -32,6 +15,7 @@
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GTUITextures;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
Expand Down Expand Up @@ -60,29 +44,50 @@ public CropSynthesiser(int aID, String aName, String aNameRegional, int aTier) {
4,
1,
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_SIDE_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_SIDE_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_SIDE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_FRONT_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_FRONT_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_FRONT_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_TOP_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_TOP_SCANNER_GLOW).glow().build()),
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP")),
TextureFactory.builder()
.addIcon(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_TOP_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_SCANNER_ACTIVE),
TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW).glow().build()),
TextureFactory
.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_ACTIVE")),
TextureFactory.builder().addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_ACTIVE_GLOW"))
.glow().build()),
TextureFactory.of(
TextureFactory.of(OVERLAY_BOTTOM_SCANNER),
TextureFactory.builder().addIcon(OVERLAY_BOTTOM_SCANNER_GLOW).glow().build()));
TextureFactory.of(new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM")),
TextureFactory.builder()
.addIcon(
new Textures.BlockIcons.CustomIcon("basicmachines/scanner/OVERLAY_BOTTOM_GLOW"))
.glow().build()));
}

public CropSynthesiser(String mName, byte mTier, String[] mDescriptionArray, ITexture[][][] mTextures) {
Expand Down
Loading
Loading