diff options
| -rw-r--r-- | misc/vector/crop_drop.rape.svg | 933 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_CropLoader.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 2 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png | bin | 0 -> 621 bytes | |||
| -rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png | bin | 0 -> 3115 bytes | |||
| -rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png | bin | 0 -> 3171 bytes | |||
| -rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png | bin | 0 -> 3302 bytes | |||
| -rw-r--r-- | src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png | bin | 0 -> 705 bytes |
10 files changed, 941 insertions, 2 deletions
diff --git a/misc/vector/crop_drop.rape.svg b/misc/vector/crop_drop.rape.svg new file mode 100644 index 0000000000..35db917110 --- /dev/null +++ b/misc/vector/crop_drop.rape.svg @@ -0,0 +1,933 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="320" + height="320" + id="svg2" + version="1.1" + inkscape:version="0.48.5 r10040" + sodipodi:docname="crop_drop.rape.svg" + inkscape:export-filename="C:\Users\Johannes\git\GT5-Unofficial\misc\vector\crop_drop.rape.png" + inkscape:export-xdpi="4.5" + inkscape:export-ydpi="4.5"> + <defs + id="defs4"> + <filter + id="filter22272" + inkscape:label="B->RG"> + <feColorMatrix + id="feColorMatrix22280" + values="0 0 1 0 0 0 0 1 0 0 0.5 0.5 0 0 0 0 0 0 1 0 " /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2" + inkscape:cx="18.251567" + inkscape:cy="195.61271" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1920" + inkscape:window-height="1017" + inkscape:window-x="-8" + inkscape:window-y="-8" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid3766" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-732.36218)"> + <image + y="732.36218" + x="-320" + id="image3763" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAdtJREFU +OI2lkr9rU1EYhp+Tpmltcm9zJdhoUmiuNU1qaay2SqUBt67+AeImuupUEZwcRFDoKlRHJzdxcyrq +ZIglhVBtTNtcITa0V8VIepN+DsWEeBN/4Lt9L+95D99zjhIR4T/k7WSqYB7YBxyQGigvYp/++wLY +IxKJEdACOA6Uy9uo4Cpin3QlPe03ZwEQexJzxCIRr5GI1xiNWc3DPzOugt7QWwL6KBOzB4Hz5yqc +nbE5lSqRXZ4CIDmzAp4Iyii6C+oNjWhkAPO4ycXLy9y9Pcfzp9sE/F8BuHTtHeGjY4SHNJDP7QUq +mEH1RNG1fdJzDdLpYa5cXeX+PRP13cviozUmJnX0oGAYvSBOB4iNLNVvPj6Va1jvh7h1c5zEmELT +4ly/kWF8egtnL4ZSUVB9LQjSRUuPS1LcEHmw6MjCnRdNPxzPCcGN5qx+/UjTF14zP+9jwA+FnEHy +zBeKmzrFQplnT2a7P6MKruANWYhnivxakmpVsfTQxCpVqFZDiEoxkirhO7LVVtBioHQa9R3WC4cR +6eOj1Q8L8PKVTv+hOpUdP5slDWmsA8PdGTCYEYxdCURyTc9/7INg2MLgGxcrF4ODdfJAD2KfaM3K +h+yaLgYdC/5Fnj9Hfq8fRib+9AQpwZcAAAAASUVORK5CYII= +" + height="320" + width="320" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3786" + width="20" + height="20" + x="60" + y="60" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0413d0;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3790" + width="20" + height="20" + x="40" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0c1df3;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3792" + width="20" + height="20" + x="60" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2b38cf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3794" + width="20" + height="20" + x="80" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0010dd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3796" + width="20" + height="20" + x="40" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2838fd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3798" + width="20" + height="20" + x="60" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4d5bf1;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3800" + width="20" + height="20" + x="80" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4f5dc2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3802" + width="20" + height="20" + x="100" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3804" + width="20" + height="20" + x="20" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3806" + width="20" + height="20" + x="20" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0113f9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3808" + width="20" + height="20" + x="40" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0110c9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3810" + width="20" + height="20" + x="40" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd1;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3812" + width="20" + height="20" + x="40" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0010df;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3814" + width="20" + height="20" + x="40" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0313e4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3816" + width="20" + height="20" + x="60" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3645fb;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3818" + width="20" + height="20" + x="60" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2c3acf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3820" + width="20" + height="20" + x="60" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3822" + width="20" + height="20" + x="60" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#333fc6;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3824" + width="20" + height="20" + x="80" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3241f7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3826" + width="20" + height="20" + x="80" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0f1ff6;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3828" + width="20" + height="20" + x="80" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fce;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3830" + width="20" + height="20" + x="80" + y="240" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3832" + width="20" + height="20" + x="100" + y="260" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fda;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3834" + width="20" + height="20" + x="120" + y="260" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0011ef;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3836" + width="20" + height="20" + x="100" + y="240" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3140fc;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3838" + width="20" + height="20" + x="100" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#5260f5;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3840" + width="20" + height="20" + x="100" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#7a86cc;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3842" + width="20" + height="20" + x="100" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8a97ee;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3844" + width="20" + height="20" + x="80" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8c9adf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3846" + width="20" + height="20" + x="100" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#7480c8;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3848" + width="20" + height="20" + x="80" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#595cdf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3850" + width="20" + height="20" + x="100" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3852" + width="20" + height="20" + x="100" + y="20" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd5;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3854" + width="20" + height="20" + x="120" + y="20" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd0;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3856" + width="20" + height="20" + x="140" + y="20" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000ec9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3858" + width="20" + height="20" + x="160" + y="20" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3860" + width="20" + height="20" + x="180" + y="20" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd1;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3862" + width="20" + height="20" + x="100" + y="40" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3864" + width="20" + height="20" + x="200" + y="40" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0b1be9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3866" + width="20" + height="20" + x="180" + y="40" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2232fe;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3868" + width="20" + height="20" + x="160" + y="40" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2737fe;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3870" + width="20" + height="20" + x="140" + y="40" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#1b2af2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3872" + width="20" + height="20" + x="120" + y="40" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2f3cce;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3874" + width="20" + height="20" + x="180" + y="60" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4a58f7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3876" + width="20" + height="20" + x="160" + y="60" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4f5df7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3878" + width="20" + height="20" + x="140" + y="60" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3d4ad7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3880" + width="20" + height="20" + x="120" + y="60" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#7781c3;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3882" + width="20" + height="20" + x="120" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8592e7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3884" + width="20" + height="20" + x="140" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#7a87db;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3886" + width="20" + height="20" + x="160" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3b3fd2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3888" + width="20" + height="20" + x="140" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8692ce;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3890" + width="20" + height="20" + x="160" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#6466d4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3892" + width="20" + height="20" + x="120" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#d4d5fe;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3894" + width="20" + height="20" + x="120" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#9d9fe4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3896" + width="20" + height="20" + x="120" + y="160" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8491cc;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3898" + width="20" + height="20" + x="120" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#7a87cd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3900" + width="20" + height="20" + x="120" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3845d5;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3902" + width="20" + height="20" + x="120" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0c1bd4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3904" + width="20" + height="20" + x="120" + y="240" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#c8c9f4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3906" + width="20" + height="20" + x="140" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#fcfcff;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3908" + width="20" + height="20" + x="140" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#e0e1ff;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3910" + width="20" + height="20" + x="140" + y="160" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#6265dd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3912" + width="20" + height="20" + x="140" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8789d2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3914" + width="20" + height="20" + x="160" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#d5d6f8;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3916" + width="20" + height="20" + x="160" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8e91fb;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3918" + width="20" + height="20" + x="160" + y="160" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8b98cf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3920" + width="20" + height="20" + x="160" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#707cbb;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3922" + width="20" + height="20" + x="160" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3542c9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3924" + width="20" + height="20" + x="160" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#909dd9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3926" + width="20" + height="20" + x="180" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#5b67da;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3928" + width="20" + height="20" + x="200" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2834d1;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3930" + width="20" + height="20" + x="220" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3932" + width="20" + height="20" + x="240" + y="60" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0011ea;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3934" + width="20" + height="20" + x="240" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#404df8;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3936" + width="20" + height="20" + x="220" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0010df;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3938" + width="20" + height="20" + x="260" + y="80" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#1828f7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3940" + width="20" + height="20" + x="240" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#8795e8;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3942" + width="20" + height="20" + x="200" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4648c6;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3944" + width="20" + height="20" + x="180" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4e5df7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3946" + width="20" + height="20" + x="220" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd0;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3948" + width="20" + height="20" + x="260" + y="100" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2939fc;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3950" + width="20" + height="20" + x="240" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000ecb;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3952" + width="20" + height="20" + x="260" + y="120" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#707cbc;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3954" + width="20" + height="20" + x="200" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#7884bd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3956" + width="20" + height="20" + x="180" + y="160" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4957dd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3958" + width="20" + height="20" + x="220" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#6b7add;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3960" + width="20" + height="20" + x="180" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2a3af9;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3962" + width="20" + height="20" + x="240" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#6170f1;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3964" + width="20" + height="20" + x="180" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#3d4bed;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3966" + width="20" + height="20" + x="180" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0b1adf;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3968" + width="20" + height="20" + x="180" + y="240" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd7;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3970" + width="20" + height="20" + x="180" + y="260" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fd2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3972" + width="20" + height="20" + x="260" + y="140" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#1826d4;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3974" + width="20" + height="20" + x="240" + y="160" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0010e1;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3976" + width="20" + height="20" + x="260" + y="160" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4b58c6;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3978" + width="20" + height="20" + x="200" + y="180" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#4a59f5;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3980" + width="20" + height="20" + x="200" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#2939fc;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3982" + width="20" + height="20" + x="200" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0011f0;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3984" + width="20" + height="20" + x="200" + y="240" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0010dd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3986" + width="20" + height="20" + x="200" + y="260" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#1f2ee3;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3988" + width="20" + height="20" + x="220" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0515e2;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3990" + width="20" + height="20" + x="240" + y="200" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#0112f0;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3992" + width="20" + height="20" + x="220" + y="220" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3994" + width="20" + height="20" + x="220" + y="240" + transform="translate(0,732.36218)" /> + <rect + style="opacity:0.98000003999999996;fill:#000fcd;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter22272)" + id="rect3996" + width="20" + height="20" + x="240" + y="220" + transform="translate(0,732.36218)" /> + </g> +</svg> diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index c8b71ff469..57d59e9688 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -320,6 +320,7 @@ public enum ItemList implements IItemContainer { Crop_Drop_Grapes, Crop_Drop_TeaLeaf, Crop_Drop_Cucumber, + Crop_Drop_Rape, Schematic, Schematic_Crafting, Schematic_1by1, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 28f82cbd5a..bf138bb19f 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -289,6 +289,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Crop_Drop_Grapes.set(addItem(tLastID = 554, "Grapes", "Source of Wine", new Object[]{"cropGrape", new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)}));
ItemList.Crop_Drop_Onion.set(addItem(tLastID = 555, "Onion", "Taking over the whole Taste", new Object[]{"cropOnion", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)}));
ItemList.Crop_Drop_Cucumber.set(addItem(tLastID = 556, "Cucumber", "Not a Sea Cucumber!", new Object[]{"cropCucumber", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)}));
+ ItemList.Crop_Drop_Rape.set(addItem(tLastID = 557, "Rape", "Time to oil up!", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
ItemList.Food_Cheese.set(addItem(tLastID = 558, "Cheese", "Click the Cheese", new Object[]{"foodCheese", new GT_FoodStat(3, 0.6F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L)}));
ItemList.Food_Dough.set(addItem(tLastID = 559, "Dough", "For making Breads", new Object[]{"foodDough", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)}));
@@ -340,6 +341,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));
GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));
GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));
+ GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(8L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));
GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));
GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.yellow_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L, new Object[0]));
diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java index 1ba7cd0839..b94d4d95ab 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java @@ -64,12 +64,13 @@ public class GT_CropLoader new GT_BaseCrop(169, "Quantaria", "unknown", null, 12, 4, 1000, 1, 4, 4, 0, 0, 1, 0, new String[]{"Metal", "Iridium", "Reed"}, Materials.Iridium, ItemList.Crop_Drop_Iridium.get(1, new Object[0]), new ItemStack[]{ItemList.Crop_Drop_Osmium.get(1, new Object[0])}); new GT_BaseCrop(170, "Stargatium", "unknown", null, 12, 4, 1500, 1, 4, 4, 0, 0, 2, 0, new String[]{"Metal", "Heavy", "Alien", "Naquadah"}, Materials.Naquadah, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Endstone, 1L), new ItemStack[]{ItemList.Crop_Drop_Naquadah.get(1, new Object[0])}); new GT_BaseCrop(171, "Lemon", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food", "Tree", "Sour"}, ItemList.Crop_Drop_Lemon.get(1, new Object[0]), null); - new GT_BaseCrop(172, "Chilly", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food", "Spicy"}, ItemList.Crop_Drop_Chilly.get(1, new Object[0]), null); + new GT_BaseCrop(172, "Chilly", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food", "Spicy"}, ItemList.Crop_Drop_Chilly.get(1, new Object[0]), null); new GT_BaseCrop(173, "Tomato", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food"}, ItemList.Crop_Drop_Tomato.get(1, new Object[0]), new ItemStack[]{ItemList.Crop_Drop_MTomato.get(1, new Object[0])}); new GT_BaseCrop(174, "Grape", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food"}, ItemList.Crop_Drop_Grapes.get(1, new Object[0]), null); new GT_BaseCrop(175, "Onion", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food"}, ItemList.Crop_Drop_Onion.get(1, new Object[0]), null); new GT_BaseCrop(176, "Cucumber", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food"}, ItemList.Crop_Drop_Cucumber.get(1, new Object[0]), null); - new GT_BaseCrop(177, "Tea", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food"}, ItemList.Crop_Drop_TeaLeaf.get(1, new Object[0]), null); + new GT_BaseCrop(177, "Tea", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food"}, ItemList.Crop_Drop_TeaLeaf.get(1, new Object[0]), null); + new GT_BaseCrop(178, "Rape", "unknown", null, 4, 4, 0, 1, 4, 1, 1, 0, 2, 0, new String[]{"Food", "Oil"}, ItemList.Crop_Drop_Rape.get(1, new Object[0]), null); } catch (Throwable e) { GT_Log.err.println("GT_Mod: Failed to register Crops to IC2."); e.printStackTrace(GT_Log.err); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 550fb677d4..9f61a6a32f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -50,6 +50,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.wheat_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.melon_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); GT_Values.RA.addFluidExtractionRecipe(new ItemStack(Items.pumpkin_seeds, 1, 32767), GT_Values.NI, Materials.SeedOil.getFluid(10), 10000, 32, 2); + GT_Values.RA.addFluidExtractionRecipe(ItemList.Crop_Drop_Rape.get(1, new Object[0]), null, Materials.SeedOil.getFluid(50), 10000, 32, 2); try { GT_DummyWorld tWorld = (GT_DummyWorld) GT_Values.DW; while (tWorld.mRandom.mIterationStep > 0) { @@ -2671,6 +2672,7 @@ if(Loader.isModLoaded("Railcraft")){ GT_Values.RA.addMixerRecipe(Materials.LightFuel.getCells(1), null, null, null, Materials.Tetranitromethane.getFluid(20), Materials.NitroFuel.getFluid(1000), Materials.Empty.getCells(1), 80, 8); GT_Values.RA.addMixerRecipe(Materials.Fuel.getCells(2), null, null, null, Materials.Tetranitromethane.getFluid(20), Materials.NitroFuel.getFluid(1000), Materials.Empty.getCells(2), 80, 8); + GT_Values.RA.addMixerRecipe(Materials.BioFuel.getCells(4), null, null, null, Materials.Tetranitromethane.getFluid(60), Materials.NitroFuel.getFluid(3000), Materials.Empty.getCells(4), 80, 8); GT_Values.RA.addChemicalRecipe(Materials.Propene.getCells(1), null, Materials.Ethylene.getGas(1000), Materials.Hydrogen.getGas(2000), Materials.Isoprene.getCells(1), 120); GT_Values.RA.addChemicalRecipe(Materials.Ethylene.getCells(1), Materials.Empty.getCells(1), Materials.Propene.getGas(1000), Materials.Isoprene.getFluid(1000), Materials.Hydrogen.getCells(2), 120); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png Binary files differnew file mode 100644 index 0000000000..8efdced399 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png Binary files differnew file mode 100644 index 0000000000..131fd33c02 --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png Binary files differnew file mode 100644 index 0000000000..f54e4f31dd --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png Binary files differnew file mode 100644 index 0000000000..e9216ac272 --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png Binary files differnew file mode 100644 index 0000000000..ee0f0d0a6d --- /dev/null +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png |
